diff --git a/ChangeLog b/ChangeLog
index e44fa33a3..0f7ffcbef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2007-06-22  Brian Matherly  <brian@gramps-project.org>
+	* src/ReportBase/_ReportDialog.py: Still let REAL exceptions pass through.
+
 2007-06-22  Brian Matherly  <brian@gramps-project.org>
 	* src/docgen/Pdfdoc.py: 0001055: Pictures of the gallery are not used in the
 	  detailed ancestor's report when output format is PDF
diff --git a/src/ReportBase/_ReportDialog.py b/src/ReportBase/_ReportDialog.py
index b8034c695..b26b0d718 100644
--- a/src/ReportBase/_ReportDialog.py
+++ b/src/ReportBase/_ReportDialog.py
@@ -697,7 +697,12 @@ def report(dbstate,uistate,person,report_class,options_class,
             except Errors.DatabaseError,msg:
                 ErrorDialog(_("Report could not be created"),str(msg))
             except AttributeError,msg:
-                RunDatabaseRepair(str(msg))
+                if str(msg).startswith("None"):
+                    # "None object type has no attribute . . . " usually means
+                    # database corruption
+                    RunDatabaseRepair(str(msg))
+                else:
+                    raise
             except:
                 log.error("Failed to run report.", exc_info=True)
             break