diff --git a/bikeshed/src/com/google/gwt/app/client/CellListPlacePickerView.java b/bikeshed/src/com/google/gwt/app/client/CellListPlacePickerView.java
index 6de1206..c5166c7 100644
--- a/bikeshed/src/com/google/gwt/app/client/CellListPlacePickerView.java
+++ b/bikeshed/src/com/google/gwt/app/client/CellListPlacePickerView.java
@@ -88,6 +88,8 @@
     // Replace the current renderer.
     this.renderer = renderer;
     cellList.setData(0, places.size(), places);
-    smodel.setSelected(places.get(0), true);
+    if (places.size() > 0) {
+      smodel.setSelected(places.get(0), true);
+    }
   }
 }