1 files changed, 12 insertions, 0 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java
index a9eb43f968..c59cfeaf0b 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/GeoJsonSource.java
@@ -194,6 +194,9 @@ public class GeoJsonSource extends Source {
    * @param feature the GeoJSON {@link Feature} to set
    */
   public void setGeoJson(Feature feature) {
+    if (detached) {
+      return;
+    }
     checkThread();
     nativeSetFeature(feature);
   }
@@ -205,6 +208,9 @@ public class GeoJsonSource extends Source {
    * @param geometry the GeoJSON {@link Geometry} to set
    */
   public void setGeoJson(Geometry geometry) {
+    if (detached) {
+      return;
+    }
     checkThread();
     nativeSetGeometry(geometry);
   }
@@ -216,6 +222,9 @@ public class GeoJsonSource extends Source {
    * @param features the GeoJSON FeatureCollection
    */
   public void setGeoJson(FeatureCollection features) {
+    if (detached) {
+      return;
+    }
     checkThread();
     nativeSetFeatureCollection(features);
   }
@@ -227,6 +236,9 @@ public class GeoJsonSource extends Source {
    * @param json the raw GeoJson FeatureCollection string
    */
   public void setGeoJson(String json) {
+    if (detached) {
+      return;
+    }
     checkThread();
     nativeSetGeoJsonString(json);
   }