diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 2d8e285ca..aae989ebf 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,4 +1,5 @@
 2006-03-05  Don Allingham  <don@gramps-project.org>
+	* src/Editors/_EditPerson.py: handle None as person
 	* src/TipOfDay.py: Fix the image location
 	* src/Editors/_EditPerson.py: fix focus_out_event
 	* src/ViewManager.py: replace the data
diff --git a/gramps2/src/Editors/_EditPerson.py b/gramps2/src/Editors/_EditPerson.py
index b381c9e4c..133453ccb 100644
--- a/gramps2/src/Editors/_EditPerson.py
+++ b/gramps2/src/Editors/_EditPerson.py
@@ -381,7 +381,7 @@ class EditPerson(EditPrimary):
     def _check_and_update_id(self):
         original = self.db.get_person_from_handle(self.obj.get_handle())
         
-        if original.get_gramps_id() != self.obj.get_gramps_id():
+        if original and original.get_gramps_id() != self.obj.get_gramps_id():
             idval = self.obj.get_gramps_id()
             person = self.db.get_person_from_gramps_id(idval)
             if person: