diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 8bee4cd58..80c725228 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -27,6 +27,8 @@
 	* src/SelectChild.py: Fix constants.
 	* src/WriteXML.py: Fix constants.
 
+	* src/GrampsBSDDB.py (upgrade_7): Enforce str for the default handle.
+
 2005-05-27  Richard Taylor <rjt-gramps@thegrindstone.me.uk>
 	* src/EditRepository.py: polish Repository Ref UI
 	* src/RelLib.py: merge minor changes from HEAD
diff --git a/gramps2/src/GrampsBSDDB.py b/gramps2/src/GrampsBSDDB.py
index eebc5b5fa..0b9f4c0c1 100644
--- a/gramps2/src/GrampsBSDDB.py
+++ b/gramps2/src/GrampsBSDDB.py
@@ -825,6 +825,9 @@ class GrampsBSDDB(GrampsDbBase):
 
     def upgrade_7(self):
         print "Upgrading to DB version 7"
+        # First, make sure the stored default person handle is str, not unicode
+        handle = self.metadata['default']
+        self.metadata['default'] = str(handle)
         trans = Transaction("",self)
         trans.set_batch(True)
         # Change every source to have reporef_list