diff --git a/commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java b/commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java
index 1b88f3ea1..1610877ac 100644
--- a/commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java
+++ b/commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java
@@ -46,7 +46,9 @@ public class GPSExtractor {
 
         locationManager.requestLocationUpdates(provider, 400, 1, myLocationListener);
         Location location = locationManager.getLastKnownLocation(provider);
-        myLocationListener.onLocationChanged(location);
+        if (location != null) {
+            myLocationListener.onLocationChanged(location);
+        }
     }
 
     protected void unregisterLocationManager() {