diff --git a/app/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java b/app/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java
index d030eb201..2bf9fe79f 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java
@@ -57,10 +57,14 @@ public class GPSExtractor {
         provider = locationManager.getBestProvider(criteria, true);
         myLocationListener = new MyLocationListener();
 
-        locationManager.requestLocationUpdates(provider, 400, 1, myLocationListener);
-        Location location = locationManager.getLastKnownLocation(provider);
-        if (location != null) {
-            myLocationListener.onLocationChanged(location);
+        try {
+            locationManager.requestLocationUpdates(provider, 400, 1, myLocationListener);
+            Location location = locationManager.getLastKnownLocation(provider);
+            if (location != null) {
+                myLocationListener.onLocationChanged(location);
+            }
+        } catch (IllegalArgumentException e){
+            Log.e(TAG, "Illegal argument exception", e);
         }
     }