From 2490bfe034c5ce66a877f8ac981f20d4dc88cd46 Mon Sep 17 00:00:00 2001
From: Tobrun <tobrun.van.nuland@gmail.com>
Date: Mon, 23 Oct 2017 06:21:26 +0200
Subject: [android] - null check mapboxMap with onStop invocation

---
 .../src/main/java/com/mapbox/mapboxsdk/maps/MapView.java             | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
index 309090ed3f..f4198cdde7 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
@@ -369,7 +369,10 @@ public class MapView extends FrameLayout {
    */
   @UiThread
   public void onStop() {
-    mapboxMap.onStop();
+    if (mapboxMap != null) {
+      // map was destroyed before it was started
+      mapboxMap.onStop();
+    }
     ConnectivityReceiver.instance(getContext()).deactivate();
     FileSource.getInstance(getContext()).deactivate();
   }
-- 
cgit v1.2.1