diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 1377d4b67..65a95209b 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,6 @@
+2005-05-06  Don Allingham  <don@gramps-project.org>
+	* src/gramps_main.py: fix beta warning dialog
+
 2005-05-03  Don Allingham  <don@gramps-project.org>
 	* src/ListBox.py: added to CVS
 	* src/Makefile.am: added ListBox.py
diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py
index 02ebc84dc..88994e5c6 100755
--- a/gramps2/src/gramps_main.py
+++ b/gramps2/src/gramps_main.py
@@ -145,16 +145,8 @@ class Gramps(GrampsDBCallback.GrampsDBCallback):
 
         try:
             GrampsCfg.loadConfig()
-                
-    
-            if GrampsKeys.get_betawarn() == 0:
-                WarningDialog(_("Use at your own risk"),
-                              _("This is an unstable development version of GRAMPS. "
-                                "It is intended as a technology preview. Do not trust your "
-                                "family database to this development version. This version may "
-                                "contain bugs which could corrupt your database."))
-                GrampsKeys.save_betawarn(1)
-                GrampsKeys.sync()
+
+            self.beta_warn()
     
             self.RelClass = PluginMgr.relationship_class
             self.relationship = self.RelClass(self.db)
@@ -162,12 +154,18 @@ class Gramps(GrampsDBCallback.GrampsDBCallback):
         
             self.init_interface()
             
+        except OSError, msg:
+            ErrorDialog(_("Configuration error"),str(msg))
+            return
         except Errors.GConfSchemaError, val:
             ErrorDialog(_("Configuration error"),
                         str(val) + _("\n\nPossibly the installation of GRAMPS was incomplete."
                           " Make sure the GConf schema of GRAMPS is properly installed."))
             gtk.main_quit()
             return
+        except:
+            DisplayTrace.DisplayTrace()
+            return
             
         if not mime_type_is_defined(const.app_gramps):
             ErrorDialog(_("Configuration error"),
@@ -207,6 +205,19 @@ class Gramps(GrampsDBCallback.GrampsDBCallback):
 
         self.db.set_researcher(GrampsCfg.get_researcher())
 
+    def beta_warn(self):
+        if not GrampsKeys.get_betawarn():
+            return
+        WarningDialog(
+            "Use at your own risk",
+            "This is an unstable development version of GRAMPS. "
+            "It is intended as a technology preview. Do not trust "
+            "your family database to this development version. "
+            "This version may contain bugs which could corrupt "
+            "your database.")
+        GrampsKeys.save_betawarn(1)
+        GrampsKeys.sync()
+
     def date_format_key_update(self,client,cnxn_id,entry,data):
         GrampsCfg.set_calendar_date_format()
         self.familyview_key_update(client,cnxn_id,entry,data)