diff --git a/ChangeLog b/ChangeLog
index 47ae814d4..bff8abd93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,8 @@
 	* src/DateDisplay.py: Move common objects back to DateDisplay class.
 	* src/dates/Date_ru.py: Add formats and quality.
 
+	* src/EditPerson.py (get_place): Use "" for empty place's handle.
+
 2005-01-17  Don Allingham  <dallingham@users.sourceforge.net>
 	* src/ReportUtils.py: Added
 	* src/BaseDoc.py: support for graphs
diff --git a/src/EditPerson.py b/src/EditPerson.py
index bc8df0b45..2e77d3f7d 100644
--- a/src/EditPerson.py
+++ b/src/EditPerson.py
@@ -1,7 +1,7 @@
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright (C) 2000-2004  Donald N. Allingham
+# Copyright (C) 2000-2005  Donald N. Allingham
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -87,7 +87,6 @@ _use_patronymic = [
     "ru","RU","ru_RU","koi8r","ru_koi8r","russian","Russian",
     ]
     
-
 #-------------------------------------------------------------------------
 #
 # EditPerson class
@@ -1746,9 +1745,9 @@ class EditPerson:
                 self.add_places.append(place)
                 return place.get_handle()
             else:
-                return None
+                return u""
         else:
-            return None
+            return u""
 
     def on_edit_name_clicked(self,obj):
         import NameEdit