diff --git a/app/src/googleplay/java/org/tasks/location/GoogleMapFragment.kt b/app/src/googleplay/java/org/tasks/location/GoogleMapFragment.kt
index 83ceaba0e..f096c7ed4 100644
--- a/app/src/googleplay/java/org/tasks/location/GoogleMapFragment.kt
+++ b/app/src/googleplay/java/org/tasks/location/GoogleMapFragment.kt
@@ -53,6 +53,9 @@ class GoogleMapFragment(private val context: Context) : MapFragment, OnMapReadyC
     }
 
     override fun setMarkers(places: List<Place>) {
+        if (map == null) {
+            return
+        }
         for (marker in markers) {
             marker.remove()
         }