diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index caff0cfe5..7d47e7a90 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-02  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
+	* src/Bookmarks.py (edit): Dont crash if bookmark list contains
+	nonexisting person.
+
 2005-08-01  Don Allingham  <don@gramps-project.org>
 	* src/NavWebPage.py: fix references to places
 	* src/WriteGedcom.py: Fix media handling, issue error message
diff --git a/gramps2/src/Bookmarks.py b/gramps2/src/Bookmarks.py
index 85bdef014..02cdf9480 100644
--- a/gramps2/src/Bookmarks.py
+++ b/gramps2/src/Bookmarks.py
@@ -145,10 +145,11 @@ class Bookmarks :
         index = 0
         for person_handle in self.bookmarks:
             person = self.db.get_person_from_handle(person_handle)
-            name = NameDisplay.displayer.display(person)
-            self.namelist.append([name])
-            self.namelist.set_row_data(index,person_handle)
-            index = index + 1
+            if person:
+                name = NameDisplay.displayer.display(person)
+                self.namelist.append([name])
+                self.namelist.set_row_data(index,person_handle)
+                index = index + 1
 
         self.response = self.top.run()
         if self.response == gtk.RESPONSE_OK: