1 files changed, 7 insertions, 3 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java
index f94867fc1a..d8763e321d 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/InfoWindow.java
@@ -192,10 +192,10 @@ public class InfoWindow {
         if (mIsVisible) {
             mIsVisible = false;
             View view = mView.get();
-            if (view != null) {
+            if (view != null && view.getParent() != null) {
                 ((ViewGroup) view.getParent()).removeView(view);
-                onClose();
             }
+            onClose();
         }
         return this;
     }
@@ -223,7 +223,7 @@ public class InfoWindow {
         MapboxMap mapboxMap = mMapboxMap.get();
         if (mapboxMap != null) {
             MapboxMap.OnInfoWindowCloseListener listener = mapboxMap.getOnInfoWindowCloseListener();
-            if(listener!=null){
+            if (listener != null) {
                 listener.onInfoWindowClose(getBoundMarker());
             }
             mapboxMap.deselectMarker(getBoundMarker());
@@ -254,4 +254,8 @@ public class InfoWindow {
         }
     }
 
+    boolean isVisible() {
+        return mIsVisible;
+    }
+
 }