diff --git a/ChangeLog b/ChangeLog
index a2adc8f57..e99da21b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@
 	in the context menu.
 	* NEWS: Update.
 
+	* src/ArgHandler.py: Fixes.
+	* src/gramps_main.py: Don't show topWindow until ArgHandler is done.
+	* src/plugins/Summary.py: Fixes.
+
 2004-06-20  Alex Roitman  <shura@alex.neuro.umn.edu>
 	* configure.in: Bump up the version number. 
 	* src/gramps.py: Pass complete argument string. 
diff --git a/src/ArgHandler.py b/src/ArgHandler.py
index 3b5f975bf..47e15ffa5 100644
--- a/src/ArgHandler.py
+++ b/src/ArgHandler.py
@@ -421,7 +421,7 @@ class ArgHandler:
         """
         if action == 'check':
             import Check
-            checker = Check.CheckIntegrity(self.parent.db)
+            checker = Check.CheckIntegrity(self.parent.db,None,None)
             checker.check_for_broken_family_links()
             checker.cleanup_missing_photos(1)
             checker.check_parent_relationships()
diff --git a/src/gramps_main.py b/src/gramps_main.py
index 075caed0b..8cc021a90 100755
--- a/src/gramps_main.py
+++ b/src/gramps_main.py
@@ -149,6 +149,11 @@ class Gramps:
 
         ArgHandler.ArgHandler(self,args)
 
+        # Don't show main window until ArgHandler is done.
+	# This prevents a window from annoyingly popping up when
+	# the command line args are sufficient to operate without it.
+	self.topWindow.show()
+
         if GrampsCfg.usetips:
             TipOfDay.TipOfDay()
 
@@ -352,7 +357,6 @@ class Gramps:
         self.back = gtk.ImageMenuItem(gtk.STOCK_GO_BACK)
         self.forward = gtk.ImageMenuItem(gtk.STOCK_GO_FORWARD)
 
-        self.topWindow.show()
         self.enable_toolbar(self.use_toolbar)
 
     def undo(self,*args):
diff --git a/src/plugins/Summary.py b/src/plugins/Summary.py
index 3ff8ab0d6..527c10537 100644
--- a/src/plugins/Summary.py
+++ b/src/plugins/Summary.py
@@ -78,7 +78,10 @@ def build_report(database,person):
             notfound.append(photo.get_path())
         
     for person_id in personList:
-        length = len(person.get_media_list())
+        person = database.try_to_find_person_from_id(person_id)
+	if not person:
+	    continue
+	length = len(person.get_media_list())
         if length > 0:
             with_photos = with_photos + 1
             total_photos = total_photos + length