diff --git a/ChangeLog b/ChangeLog
index 5c8a557ea..513ddca3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2006-07-03  Don Allingham  <don@gramps-project.org>
-	* src/DataViews/_PlaceView.py: add attempt to map to google maps
+	* src/DataViews/_PlaceView.py: add attempt to map to google maps,
+	check for valid list
 	* src/glade/gramps.glade: fix date status button.
 
 2006-07-02  Don Allingham  <don@gramps-project.org>
diff --git a/src/DataViews/_PlaceView.py b/src/DataViews/_PlaceView.py
index 350f7e7f8..87ca83aa0 100644
--- a/src/DataViews/_PlaceView.py
+++ b/src/DataViews/_PlaceView.py
@@ -103,8 +103,11 @@ class PlaceView(PageView.ListView):
 
     def google(self, obj):
         import GrampsDisplay
-        
-        place_handle = self.selected_handles()[0]
+
+        try:
+            place_handle = self.selected_handles()[0]
+        except IndexError:
+            return
         place = self.dbstate.db.get_place_from_handle(place_handle)
         descr = place.get_title()
         longitude = place.get_longitude()