diff --git a/src/GrampsParser.py b/src/GrampsParser.py
index b7988614e..f3fa1abd8 100644
--- a/src/GrampsParser.py
+++ b/src/GrampsParser.py
@@ -275,7 +275,6 @@ class GrampsParser:
         if attrs.has_key('ref'):
             self.witness = RelLib.Witness(RelLib.Event.ID,attrs['ref'])
         if attrs.has_key('name'):
-            print "name",attrs['name']
             self.witness = RelLib.Witness(RelLib.Event.NAME,attrs['name'])
         
     def start_coord(self,attrs):
diff --git a/src/PeopleView.py b/src/PeopleView.py
index ef5ecc7cf..1755f4895 100644
--- a/src/PeopleView.py
+++ b/src/PeopleView.py
@@ -90,7 +90,7 @@ class PeopleView:
             except:
                 self.parent.change_active_person(None)
                 self.person_tree.unselect()
-
+                
     def change_alpha_page(self,obj,junk,page):
         """Change the page. Be careful not to take action while the pages
         are begin removed. If clearing_tabs is set, then we don't do anything"""
diff --git a/src/RelLib.py b/src/RelLib.py
index bd09d9a85..0e9b77125 100644
--- a/src/RelLib.py
+++ b/src/RelLib.py
@@ -2304,12 +2304,9 @@ class GrampsDB(Persistent):
         return self.surnames
 
     def addSurname(self,name):
-        try:
-            if name and name not in self.surnames:
-                self.surnames.append(name)
-                self.surnames.sort()
-        except:
-            print name
+        if name and name not in self.surnames:
+            self.surnames.append(name)
+            self.surnames.sort()
     
     def getBookmarks(self):
         """returns the list of Person instances in the bookmarks"""
diff --git a/src/gramps_main.py b/src/gramps_main.py
index e41c342d3..62a943d18 100755
--- a/src/gramps_main.py
+++ b/src/gramps_main.py
@@ -397,29 +397,34 @@ class Gramps:
         item.show()
         gomenu.append(item)
 
-        if len(self.history) > 0:
-            # Draw separator
-            item = gtk.MenuItem()
-            item.show()
-            gomenu.append(item)
-
-            pids = self.mhistory[:]
-            pids.reverse()
-            num = 0
-            haveit = []
-            for pid in pids:
-                if num >= 10:
-                    break
-                if pid not in haveit:
-                    haveit.append(pid)
-                    person = self.db.getPerson(pid)
-                    item = gtk.MenuItem("_%d. %s [%s]" % 
-                        (num,person.getPrimaryName().getName(),pid))
-                    item.connect("activate",self.bookmark_callback,person)
-                    item.show()
-                    gomenu.append(item)
-                    num = num + 1
-        else:
+        try:
+            if len(self.history) > 0:
+                # Draw separator
+                item = gtk.MenuItem()
+                item.show()
+                gomenu.append(item)
+                
+                pids = self.mhistory[:]
+                pids.reverse()
+                num = 0
+                haveit = []
+                for pid in pids:
+                    if num >= 10:
+                        break
+                    if pid not in haveit:
+                        haveit.append(pid)
+                        person = self.db.getPerson(pid)
+                        item = gtk.MenuItem("_%d. %s [%s]" % 
+                                            (num,person.getPrimaryName().getName(),pid))
+                        item.connect("activate",self.bookmark_callback,person)
+                        item.show()
+                        gomenu.append(item)
+                        num = num + 1
+            else:
+                self.back.set_sensitive(0)
+                self.forward.set_sensitive(0)
+        except:
+            self.history = []
             self.back.set_sensitive(0)
             self.forward.set_sensitive(0)