diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 353e43ce8..028775e04 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-03  Don Allingham  <don@gramps-project.org>
+	* src/EditPerson.py: Don't add empty strings to pdmap
+	* src/AutoComp.py: don't add empty strings to completion
+
 2005-06-03  Alexander Roitman  <shura@gramps-project.org>
 	* src/Utils.py (bold_label,unbold_label,temp_label): optionally
 	set cursor.
diff --git a/gramps2/example/gedcom/sample.ged b/gramps2/example/gedcom/sample.ged
index 717e6dfa5..02076f73c 100755
--- a/gramps2/example/gedcom/sample.ged
+++ b/gramps2/example/gedcom/sample.ged
@@ -102,6 +102,7 @@
 2 DATE BET. 1794 - 1796
 2 PLAC Tommarp, Kristianstad Lan, Sweden
 1 DEAT
+2 DATE deceased
 2 PLAC Sweden
 1 REFN 366
 1 FAMS @F03@
diff --git a/gramps2/src/AutoComp.py b/gramps2/src/AutoComp.py
index a11a137a5..068150633 100644
--- a/gramps2/src/AutoComp.py
+++ b/gramps2/src/AutoComp.py
@@ -32,7 +32,8 @@ def fill_combo(combo,data_list):
     store = gtk.ListStore(gobject.TYPE_STRING)
 
     for data in data_list:
-        store.append(row=[data])
+        if data:
+            store.append(row=[data])
 	    
     combo.set_model(store)
     combo.set_text_column(0)
@@ -45,7 +46,8 @@ def fill_combo(combo,data_list):
 def fill_entry(entry,data_list):
     store = gtk.ListStore(gobject.TYPE_STRING)
     for data in data_list:
-        store.append(row=[data])
+        if data:
+            store.append(row=[data])
         
     completion = gtk.EntryCompletion()
     completion.set_model(store)
@@ -56,7 +58,8 @@ def fill_entry(entry,data_list):
 def fill_option_text(combobox,data):
     store = gtk.ListStore(str)
     for item in data:
-        store.append(row=[item])
+        if item:
+            store.append(row=[item])
     combobox.set_model(store)
     combobox.set_active(0)
 
diff --git a/gramps2/src/EditPerson.py b/gramps2/src/EditPerson.py
index d65e112ec..1716386c9 100644
--- a/gramps2/src/EditPerson.py
+++ b/gramps2/src/EditPerson.py
@@ -537,7 +537,8 @@ class EditPerson:
         cursor = self.db.get_place_cursor()
         data = cursor.next()
         while data:
-            self.pdmap[data[1][2]] = data[0]
+            if data[1][2]:
+                self.pdmap[data[1][2]] = data[0]
             data = cursor.next()
         cursor.close()