diff --git a/android/src/main/java/com/google/android/react/navsdk/NavViewModule.java b/android/src/main/java/com/google/android/react/navsdk/NavViewModule.java
index e4f8570..f36072a 100644
--- a/android/src/main/java/com/google/android/react/navsdk/NavViewModule.java
+++ b/android/src/main/java/com/google/android/react/navsdk/NavViewModule.java
@@ -154,7 +154,7 @@ public void addMarker(String nativeID, ReadableMap options, final Promise promis
     UiThreadUtil.runOnUiThread(
         () -> {
           IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
-          if (fragment == null) {
+          if (fragment == null || fragment.getMapController() == null) {
             promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
             return;
           }
@@ -175,7 +175,7 @@ public void addPolyline(String nativeID, ReadableMap options, final Promise prom
     UiThreadUtil.runOnUiThread(
         () -> {
           IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
-          if (fragment == null) {
+          if (fragment == null || fragment.getMapController() == null) {
             promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
             return;
           }
@@ -192,7 +192,7 @@ public void addPolygon(String nativeID, ReadableMap options, final Promise promi
     UiThreadUtil.runOnUiThread(
         () -> {
           IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
-          if (fragment == null) {
+          if (fragment == null || fragment.getMapController() == null) {
             promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
             return;
           }
@@ -209,7 +209,7 @@ public void addCircle(String nativeID, ReadableMap options, final Promise promis
     UiThreadUtil.runOnUiThread(
         () -> {
           IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
-          if (fragment == null) {
+          if (fragment == null || fragment.getMapController() == null) {
             promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
             return;
           }
@@ -226,7 +226,7 @@ public void addGroundOverlay(String nativeID, ReadableMap options, final Promise
     UiThreadUtil.runOnUiThread(
         () -> {
           IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
-          if (fragment == null) {
+          if (fragment == null || fragment.getMapController() == null) {
             promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
             return;
           }
@@ -251,7 +251,7 @@ public void moveCamera(String nativeID, ReadableMap cameraPosition, final Promis
     UiThreadUtil.runOnUiThread(
         () -> {
           IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
-          if (fragment == null) {
+          if (fragment == null || fragment.getMapController() == null) {
             promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
             return;
           }
@@ -285,7 +285,7 @@ public void clearMapView(String nativeID, final Promise promise) {
     UiThreadUtil.runOnUiThread(
         () -> {
           IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
-          if (fragment == null) {
+          if (fragment == null || fragment.getMapController() == null) {
             promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
             return;
           }
@@ -300,7 +300,7 @@ public void removeMarker(String nativeID, String id, final Promise promise) {
     UiThreadUtil.runOnUiThread(
         () -> {
           IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
-          if (fragment == null) {
+          if (fragment == null || fragment.getMapController() == null) {
             promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
             return;
           }
@@ -315,7 +315,7 @@ public void removePolyline(String nativeID, String id, final Promise promise) {
     UiThreadUtil.runOnUiThread(
         () -> {
           IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
-          if (fragment == null) {
+          if (fragment == null || fragment.getMapController() == null) {
             promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
             return;
           }
@@ -330,7 +330,7 @@ public void removePolygon(String nativeID, String id, final Promise promise) {
     UiThreadUtil.runOnUiThread(
         () -> {
           IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
-          if (fragment == null) {
+          if (fragment == null || fragment.getMapController() == null) {
             promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
             return;
           }
@@ -345,7 +345,7 @@ public void removeCircle(String nativeID, String id, final Promise promise) {
     UiThreadUtil.runOnUiThread(
         () -> {
           IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
-          if (fragment == null) {
+          if (fragment == null || fragment.getMapController() == null) {
             promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
             return;
           }
@@ -360,7 +360,7 @@ public void removeGroundOverlay(String nativeID, String id, final Promise promis
     UiThreadUtil.runOnUiThread(
         () -> {
           IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
-          if (fragment == null) {
+          if (fragment == null || fragment.getMapController() == null) {
             promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
             return;
           }
@@ -375,7 +375,7 @@ public void setZoomLevel(String nativeID, double level, final Promise promise) {
     UiThreadUtil.runOnUiThread(
         () -> {
           IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
-          if (fragment == null) {
+          if (fragment == null || fragment.getMapController() == null) {
             promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
             return;
           }
@@ -410,7 +410,7 @@ public void setFollowingPerspective(
     UiThreadUtil.runOnUiThread(
         () -> {
           IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
-          if (fragment == null) {
+          if (fragment == null || fragment.getMapController() == null) {
             promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
             return;
           }
@@ -432,7 +432,7 @@ public void getMarkers(String nativeID, final Promise promise) {
     UiThreadUtil.runOnUiThread(
         () -> {
           IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
-          if (fragment == null) {
+          if (fragment == null || fragment.getMapController() == null) {
             promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
             return;
           }
@@ -452,7 +452,7 @@ public void getCircles(String nativeID, final Promise promise) {
     UiThreadUtil.runOnUiThread(
         () -> {
           IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
-          if (fragment == null) {
+          if (fragment == null || fragment.getMapController() == null) {
             promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
             return;
           }
@@ -472,7 +472,7 @@ public void getPolylines(String nativeID, final Promise promise) {
     UiThreadUtil.runOnUiThread(
         () -> {
           IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
-          if (fragment == null) {
+          if (fragment == null || fragment.getMapController() == null) {
             promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
             return;
           }
@@ -492,7 +492,7 @@ public void getPolygons(String nativeID, final Promise promise) {
     UiThreadUtil.runOnUiThread(
         () -> {
           IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
-          if (fragment == null) {
+          if (fragment == null || fragment.getMapController() == null) {
             promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
             return;
           }
@@ -512,7 +512,7 @@ public void getGroundOverlays(String nativeID, final Promise promise) {
     UiThreadUtil.runOnUiThread(
         () -> {
           IMapViewFragment fragment = mNavViewManager.getFragmentByNativeId(nativeID);
-          if (fragment == null) {
+          if (fragment == null || fragment.getMapController() == null) {
             promise.reject(JsErrors.NO_MAP_ERROR_CODE, JsErrors.NO_MAP_ERROR_MESSAGE);
             return;
           }