diff --git a/app/src/googleplay/java/org/tasks/location/LocationServiceGooglePlay.kt b/app/src/googleplay/java/org/tasks/location/LocationServiceGooglePlay.kt
index f95b6fb0b..d9897dee0 100644
--- a/app/src/googleplay/java/org/tasks/location/LocationServiceGooglePlay.kt
+++ b/app/src/googleplay/java/org/tasks/location/LocationServiceGooglePlay.kt
@@ -25,7 +25,10 @@ class LocationServiceGooglePlay @Inject constructor(
                     .getFusedLocationProviderClient(context)
                     .lastLocation
                     .addOnSuccessListener {
-                        cont.resumeWith(Result.success(MapPosition(it.latitude, it.longitude)))
+                        cont.resumeWith(
+                                it?.let { Result.success(MapPosition(it.latitude, it.longitude)) }
+                                        ?: Result.failure(NullPointerException())
+                        )
                     }
                     .addOnFailureListener { cont.resumeWith(Result.failure(it)) }
         }