diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 4c048e1b6..70aea3ef7 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,6 @@
+2005-08-12  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
+	* src/MapView.py: Dont fail if xearth is not installed
+	
 2005-08-12  Don Allingham  <don@gramps-project.org>
 	* src/Navigation.py: Don't disable the interface all the time.
 
@@ -6,8 +9,8 @@
 	* src/gramps_main.py: Run ArgHandler with new arguments.
 
 2005-08-12  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
-	* src/MapView.py: Corrected coordinate handling; Show all location in map;
-	fetch locations from xearth config file
+	* src/MapView.py: Corrected coordinate handling; Show all locations
+	in map; fetch locations from xearth config file
 
 2005-08-12  Richard Taylor <rjt-gramps@thegrindstone.me.uk>
         * src/EditRepository.py: changes to work with ViewManager changes
diff --git a/gramps2/src/MapView.py b/gramps2/src/MapView.py
index a6f33f9d3..eb718e50b 100644
--- a/gramps2/src/MapView.py
+++ b/gramps2/src/MapView.py
@@ -364,10 +364,11 @@ class MapView(PageView.PageView):
         self.zoom_map.set_guide(self.guide_map)
         
         # And the place list
-        d = self.get_xearth_markers()
-        if not d:
-            d = data
-        self.place_list_view = MapPlacesList( d)
+	try:
+            d = self.get_xearth_markers()
+            self.place_list_view = MapPlacesList( d)
+	except:
+            self.place_list_view = MapPlacesList( data)
         self.place_list_view.set_size_request(128,-1)
         vport = gtk.ScrolledWindow()
         vbox.pack_start(vport,True,True,0)