diff --git a/gramps/plugins/view/geoclose.py b/gramps/plugins/view/geoclose.py
index 331423717..c79ceaa87 100644
--- a/gramps/plugins/view/geoclose.py
+++ b/gramps/plugins/view/geoclose.py
@@ -209,12 +209,17 @@ class GeoClose(GeoGraphyView):
             self._createmap(p1, color, self.place_list_active, False)
         if self.refperson:
             color = self._config.get('geography.color1')
-            self.message_layer.add_message(_("Reference : %(name)s ( %(birth)s - %(death)s )") % {'name': _nd.display(self.refperson),
-                                                                              'birth': self.birth(self.refperson),
-                                                                              'death': self.death(self.refperson)})
-            self.message_layer.add_message(_("The other : %(name)s ( %(birth)s - %(death)s )") % {'name': _nd.display(p1),
-                                                                              'birth': self.birth(p1),
-                                                                              'death': self.death(p1)})
+            self.message_layer.add_message(_("Reference : %(name)s ( %(birth)s - %(death)s )") % {
+                                                           'name': _nd.display(self.refperson),
+                                                           'birth': self.birth(self.refperson),
+                                                           'death': self.death(self.refperson)})
+            if p1:
+                self.message_layer.add_message(_("The other : %(name)s ( %(birth)s - %(death)s )") % {
+                                                               'name': _nd.display(p1),
+                                                               'birth': self.birth(p1),
+                                                               'death': self.death(p1)})
+            else:
+                self.message_layer.add_message(_("The other person is unknown"))
             self._createmap(self.refperson, color, self.place_list_ref, True)
         else:
             self.message_layer.add_message(_("You must choose one reference person."))
@@ -294,7 +299,10 @@ class GeoClose(GeoGraphyView):
         active = self.get_active()
         person = self.dbstate.db.get_person_from_handle(active)
         self.lifeway_layer.clear_ways()
-        self.goto_handle(handle=person)
+        if person is None:
+            self.goto_handle(None)
+        else:
+            self.goto_handle(handle=person)
 
     def draw(self, menu, marks, color, reference):
         """
diff --git a/gramps/plugins/view/geofamclose.py b/gramps/plugins/view/geofamclose.py
index 05a619ab1..e9b6877f1 100644
--- a/gramps/plugins/view/geofamclose.py
+++ b/gramps/plugins/view/geofamclose.py
@@ -240,7 +240,10 @@ class GeoFamClose(GeoGraphyView):
             color = self._config.get('geography.color1')
             self._createmap(self.reffamily, color, self.place_list_ref, True)
             self.message_layer.add_message(_("Family reference : %s" % self.family_label(self.reffamily)))
-            self.message_layer.add_message(_("The other family : %s" % self.family_label(f1)))
+            if f1:
+                self.message_layer.add_message(_("The other family : %s" % self.family_label(f1)))
+            else:
+                self.message_layer.add_message(_("The other family : %s" % _("Unknown")))
         else:
             self.message_layer.add_message(_("You must choose one reference family."))
             self.message_layer.add_message(_("Go to the family view and select "