diff --git a/onebusaway-android/src/google/java/org/onebusaway/android/map/googlemapsv2/VehicleOverlay.java b/onebusaway-android/src/google/java/org/onebusaway/android/map/googlemapsv2/VehicleOverlay.java
index 0551797af..fcae82e89 100644
--- a/onebusaway-android/src/google/java/org/onebusaway/android/map/googlemapsv2/VehicleOverlay.java
+++ b/onebusaway-android/src/google/java/org/onebusaway/android/map/googlemapsv2/VehicleOverlay.java
@@ -549,6 +549,7 @@ private void setupMarkerData() {
 
     @Override
     public boolean markerClicked(Marker marker) {
+        if(mMarkerData == null) return false;
         ObaTripStatus status = mMarkerData.getStatusFromMarker(marker);
         if (status != null) {
             setupInfoWindow();