diff --git a/src/plugins/view/geoclose.py b/src/plugins/view/geoclose.py
index ae77e22de..8186f087d 100644
--- a/src/plugins/view/geoclose.py
+++ b/src/plugins/view/geoclose.py
@@ -163,7 +163,7 @@ class GeoClose(GeoGraphyView):
         This assumes that this icon has already been registered 
         as a stock icon.
         """
-        return 'geo-show-family'
+        return 'gramps-relation'
     
     def get_viewtype_stock(self):
         """Type of view in category
@@ -198,6 +198,7 @@ class GeoClose(GeoGraphyView):
         self.place_list_ref = []
         self.all_place_list = []
         self.sort = []
+        self.places_found = []
         self.place_without_coordinates = []
         self.remove_all_gps()
         self.remove_all_markers()
diff --git a/src/plugins/view/geoevents.py b/src/plugins/view/geoevents.py
index a767dd955..2f11bb2e0 100644
--- a/src/plugins/view/geoevents.py
+++ b/src/plugins/view/geoevents.py
@@ -174,6 +174,7 @@ class GeoEvents(GeoGraphyView):
         """
         Rebuild the tree with the given events handle as the root.
         """
+        self.places_found = []
         self.build_tree()
 
     def show_all_events(self, menu, event, lat, lon):
diff --git a/src/plugins/view/geofamclose.py b/src/plugins/view/geofamclose.py
index f6e47c35a..5c18131f5 100644
--- a/src/plugins/view/geofamclose.py
+++ b/src/plugins/view/geofamclose.py
@@ -198,6 +198,7 @@ class GeoFamClose(GeoGraphyView):
         self.place_list_ref = []
         self.all_place_list = []
         self.sort = []
+        self.places_found = []
         self.place_without_coordinates = []
         self.remove_all_gps()
         self.remove_all_markers()
diff --git a/src/plugins/view/geofamily.py b/src/plugins/view/geofamily.py
index 154b74cca..9248ce7bf 100644
--- a/src/plugins/view/geofamily.py
+++ b/src/plugins/view/geofamily.py
@@ -173,6 +173,7 @@ class GeoFamily(GeoGraphyView):
         """
         Rebuild the tree with the given person handle as the root.
         """
+        self.places_found = []
         self.build_tree()
 
     def build_tree(self):
diff --git a/src/plugins/view/geoperson.py b/src/plugins/view/geoperson.py
index f724bdedb..636b14d2d 100644
--- a/src/plugins/view/geoperson.py
+++ b/src/plugins/view/geoperson.py
@@ -201,6 +201,7 @@ class GeoPerson(GeoGraphyView):
         """
         Rebuild the tree with the given person handle as the root.
         """
+        self.places_found = []
         if handle:
             self.change_active(handle)
             self._createmap(handle)
diff --git a/src/plugins/view/geoplaces.py b/src/plugins/view/geoplaces.py
index 55ed480e9..631dd488c 100644
--- a/src/plugins/view/geoplaces.py
+++ b/src/plugins/view/geoplaces.py
@@ -174,6 +174,7 @@ class GeoPlaces(GeoGraphyView):
         """
         Rebuild the tree with the given places handle as the root.
         """
+        self.places_found = []
         self.build_tree()
 
     def show_all_places(self, menu, event, lat, lon):
@@ -251,7 +252,10 @@ class GeoPlaces(GeoGraphyView):
                 self._create_one_place(place)
         else:
             if place_x is None:
-                places_handle = dbstate.db.iter_place_handles()
+                try:
+                    places_handle = dbstate.db.get_place_handles()
+                except:
+                    return
                 for place_hdl in places_handle:
                     place = dbstate.db.get_place_from_handle(place_hdl)
                     self._create_one_place(place)