#2414 - Add explicit null check for infoWindow

1 files changed, 3 insertions, 1 deletions

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;
     }