diff --git a/ChangeLog b/ChangeLog
index a87d2b8c5..779c53ba7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-06  Don Allingham  <don@gramps-project.org>
+	* src/GrampsDb/_GrampsDbBase.py (GrampsDbBase.close_undodb): don't complain
+	if the undo file isn't here.
+
 2007-04-05  Don Allingham  <don@gramps-project.org>
 	* src/plugins/Checkpoint.py: fix some more Popen issues
 
diff --git a/src/GrampsDb/_GrampsDbBase.py b/src/GrampsDb/_GrampsDbBase.py
index 7cefcd3ea..a37832aba 100644
--- a/src/GrampsDb/_GrampsDbBase.py
+++ b/src/GrampsDb/_GrampsDbBase.py
@@ -371,7 +371,10 @@ class GrampsDbBase(GrampsDBCallback):
 
     def close_undodb(self):
         if not self.readonly:
-            self.undodb.close()
+            try:
+                self.undodb.close()
+            except db.DBNoSuchFileError, msg:
+                pass
             try:
                 os.remove(self.undolog)
             except: