1 files changed, 8 insertions, 5 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java
index b1d6df2103..80ffa973e7 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.java
@@ -143,11 +143,14 @@ class IconManager {
   }
 
   void iconCleanup(Icon icon) {
-    int refCounter = iconMap.get(icon) - 1;
-    if (refCounter == 0) {
-      remove(icon);
-    } else {
-      updateIconRefCounter(icon, refCounter);
+    Integer refCounter = iconMap.get(icon);
+    if (refCounter != null) {
+      refCounter--;
+      if (refCounter == 0) {
+        remove(icon);
+      } else {
+        updateIconRefCounter(icon, refCounter);
+      }
     }
   }