diff --git a/src/gen/db/write.py b/src/gen/db/write.py
index 71c7a93fb..b566d6bf3 100644
--- a/src/gen/db/write.py
+++ b/src/gen/db/write.py
@@ -1059,7 +1059,7 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
         self.env            = None
         self.metadata       = None
         self.db_is_open     = False
-        self.surname_lis = None
+        self.surname_list = None
         
         DbBsddbRead.close(self)
         
diff --git a/src/gui/editors/editname.py b/src/gui/editors/editname.py
index 1cf6267a7..cdda818b8 100644
--- a/src/gui/editors/editname.py
+++ b/src/gui/editors/editname.py
@@ -457,3 +457,4 @@ class EditName(EditSecondary):
         # can't use group_over, see Note in gen/lib/name/Name.set_group_as().
         if not self.group_as.obj.get_editable():
             self.obj.set_group_as("")
+        EditSecondary._cleanup_on_exit(self)
\ No newline at end of file
diff --git a/src/gui/editors/editsecondary.py b/src/gui/editors/editsecondary.py
index a2c4414d9..fe83014ba 100644
--- a/src/gui/editors/editsecondary.py
+++ b/src/gui/editors/editsecondary.py
@@ -116,9 +116,10 @@ class EditSecondary(ManagedWindow.ManagedWindow, DbGUIElement):
         self.__tabs = None
         self.dbstate = None
         self.uistate = None
-        self.obj = obj
+        self.obj = None
         self.db = None
-        self.callman.database = None
+        if self.callman:
+            self.callman.database = None
         self.callman = None
 
     def define_ok_button(self,button,function):
@@ -141,8 +142,8 @@ class EditSecondary(ManagedWindow.ManagedWindow, DbGUIElement):
 
     def close(self, *obj):
         self._cleanup_db_connects()
-        self._cleanup_on_exit()
         ManagedWindow.ManagedWindow.close(self)
+        self._cleanup_on_exit()
 
     def _cleanup_db_connects(self):
         """