diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index a258ccf90..70ef8044c 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,4 +1,6 @@
 2006-06-20  Don Allingham  <don@gramps-project.org>
+	* src/DataViews/_PersonView.py (PersonView.person_updated): if surname
+	fails, recalculate data
 	* src/Editors/_EditFamily.py: handle drag-n-drop for childrefs 
 	separately
 	* src/Editors/_EditEvent.py: focus on date on open
diff --git a/gramps2/src/DataViews/_PersonView.py b/gramps2/src/DataViews/_PersonView.py
index ebe8c39e3..fab972954 100644
--- a/gramps2/src/DataViews/_PersonView.py
+++ b/gramps2/src/DataViews/_PersonView.py
@@ -151,11 +151,11 @@ class PersonView(PageView.PersonNavView):
         if len(mlist) != 2:
             from QuestionDialog import ErrorDialog
             
-            msg = _("Cannot merge people")
-            msg2 = _("Exactly two people must be selected to perform a merge. "
-                     "A second person can be selected by holding down the "
-                     "control key while clicking on the desired person.")
-            ErrorDialog(msg,msg2)
+            ErrorDialog(
+		_("Cannot merge people"),
+		_("Exactly two people must be selected to perform a merge. "
+		  "A second person can be selected by holding down the "
+		  "control key while clicking on the desired person."))
         else:
             from QuestionDialog import ErrorDialog
             import Merge 
@@ -175,11 +175,11 @@ class PersonView(PageView.PersonNavView):
         mlist = self.get_selected_objects()
 
         if len(mlist) != 2:
-            msg = _("Cannot merge people")
-            msg2 = _("Exactly two people must be selected to perform a merge. "
-                     "A second person can be selected by holding down the "
-                     "control key while clicking on the desired person.")
-            ErrorDialog(msg,msg2)
+            ErrorDialog(
+		_("Cannot merge people"),
+		_("Exactly two people must be selected to perform a merge. "
+		  "A second person can be selected by holding down the "
+		  "control key while clicking on the desired person."))
         else:
             import Merge
             
@@ -188,11 +188,11 @@ class PersonView(PageView.PersonNavView):
             if p1 and p2:
                 Merge.MergePeopleUI(self.dbstate, self.uistate, p1, p2)
             else:
-                msg = _("Cannot merge people")
-                msg2 = _("Exactly two people must be selected to perform a merge. "
-                         "A second person can be selected by holding down the "
-                         "control key while clicking on the desired person.")
-                ErrorDialog(msg,msg2)
+                ErrorDialog(
+		    _("Cannot merge people"),
+		    _("Exactly two people must be selected to perform a merge. "
+		      "A second person can be selected by holding down the "
+		      "control key while clicking on the desired person."))
                 
     def column_editor(self,obj):
         import ColumnOrder
@@ -720,7 +720,10 @@ class PersonView(PageView.PersonNavView):
                 surname = self.dbstate.db.get_name_group_mapping(base)
 
             if oldpath[0] == surname:
-                self.model.build_sub_entry(surname)
+		try:
+		    self.model.build_sub_entry(surname)
+		except:
+		    self.model.calculate_data()
             else:
                 self.model.calculate_data()