diff --git a/ChangeLog b/ChangeLog
index fa4720c34..4dc1359e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-08-19  Tim Waugh  <twaugh@redhat.com>
-	 * src/gramps_main.py (import_tool_callback): Set home person.
+	* src/WriteGedcom.py (get_persons_sources): Remove extra calls to
+	get_handle() to prevent traceback.
+	* src/gramps_main.py (import_tool_callback): Set home person.
 
 2004-08-19  Don Allingham  <dallingham@users.sourceforge.net>
 	* src/DisplayModels.py: simplify internal iter handling.
diff --git a/src/WriteGedcom.py b/src/WriteGedcom.py
index fd134d98a..d6b833876 100644
--- a/src/WriteGedcom.py
+++ b/src/WriteGedcom.py
@@ -155,16 +155,16 @@ def add_persons_sources(db,person,slist,private):
             continue
         for source_ref in event.get_source_references():
             sbase = source_ref.get_base_handle()
-            if sbase != None and not slist.has_key(sbase.get_handle()):
-                slist[sbase.get_handle()] = 1
+            if sbase != None and not slist.has_key(sbase):
+                slist[sbase] = 1
 
     for event in person.get_attribute_list():
         if private and event.get_privacy():
             continue
         for source_ref in event.get_source_references():
             sbase = source_ref.get_base_handle()
-            if sbase != None and not slist.has_key(sbase.get_handle()):
-                slist[sbase.get_handle()] = 1
+            if sbase != None and not slist.has_key(sbase):
+                slist[sbase] = 1
 
     for name in person.get_alternate_names() + [person.get_primary_name()]:
         if private and name.get_privacy():