1 files changed, 8 insertions, 6 deletions
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java
index 52181cee0c..d8752bbea2 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/annotation/AnimatedMarkerActivity.java
@@ -236,12 +236,14 @@ public class AnimatedMarkerActivity extends AppCompatActivity {
 
     stopped = true;
 
-    // Stop ongoing animations, prevent memory lekas
-    MarkerViewManager markerViewManager = mapboxMap.getMarkerViewManager();
-    for (MarkerView markerView : markerViews) {
-      View view = markerViewManager.getView(markerView);
-      if (view != null) {
-        view.animate().cancel();
+    // Stop ongoing animations, prevent memory leaks
+    if (mapboxMap != null) {
+      MarkerViewManager markerViewManager = mapboxMap.getMarkerViewManager();
+      for (MarkerView markerView : markerViews) {
+        View view = markerViewManager.getView(markerView);
+        if (view != null) {
+          view.animate().cancel();
+        }
       }
     }