From c3fe83f709839b3faf4900eb67f52053234ea363 Mon Sep 17 00:00:00 2001
From: Brad Leege <bleege@gmail.com>
Date: Thu, 24 Sep 2015 10:36:36 -0500
Subject: [PATCH] #2414 - Add explicit null check for infoWindow

---
 .../src/main/java/com/mapbox/mapboxgl/annotations/Marker.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Marker.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Marker.java
index 17317bffb..2e76a8d9b 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Marker.java
+++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Marker.java
@@ -78,7 +78,9 @@ public class Marker extends Annotation {
     }
 
     public void hideInfoWindow() {
-        infoWindow.close();
+        if (infoWindow != null) {
+            infoWindow.close();
+        }
         infoWindowShown = false;
     }