diff --git a/commons/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java b/commons/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
index 4fae74a9f..16d0d429f 100644
--- a/commons/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
+++ b/commons/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
@@ -307,9 +307,13 @@ public  class       ShareActivity
     @Override
     public void onPause() {
         super.onPause();
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M || ContextCompat.checkSelfPermission(this,
-                Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
+
+        try {
             imageObj.unregisterLocationManager();
+            Log.d(TAG, "Unregistered locationManager");
+        }
+        catch (NullPointerException e) {
+            Log.d(TAG, "locationManager does not exist, not unregistered");
         }
     }