diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
index 30b4ecf59..bc0fe786d 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java
@@ -112,6 +112,7 @@ public  class       ContributionsActivity
         setTitle(R.string.title_activity_contributions);
         setContentView(R.layout.activity_contributions);
 
+        // Activity can call methods in the fragment by acquiring a reference to the Fragment from FragmentManager, using findFragmentById()
         contributionsList = (ContributionsListFragment)getSupportFragmentManager().findFragmentById(R.id.contributionsListFragment);
 
         getSupportFragmentManager().addOnBackStackChangedListener(this);
@@ -133,6 +134,9 @@ public  class       ContributionsActivity
         outState.putBoolean("mediaDetailsVisible", (mediaDetails != null && mediaDetails.isVisible()));
     }
 
+    /** Replace whatever is in the current contributionsFragmentContainer view with mediaDetailPagerFragment,
+    /   and preserve previous state in back stack.
+    /   Called when user selects a contribution. */
     private void showDetail(int i) {
         if(mediaDetails == null ||!mediaDetails.isVisible()) {
             mediaDetails = new MediaDetailPagerFragment();
@@ -284,7 +288,7 @@ public  class       ContributionsActivity
             getSupportActionBar().setDisplayHomeAsUpEnabled(false);
         }
     }
-    
+
     public void refreshSource() {
         getSupportLoaderManager().restartLoader(0, null, this);
     }
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 0486b00e5..d030eb201 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
@@ -86,6 +86,9 @@ public class GPSExtractor {
         } catch (IOException e) {
             Log.w("Image", e);
             return null;
+        } catch (IllegalArgumentException e) {
+            Log.w("Image", e);
+            return null;
         }
 
         if (exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE) == null && useGPS) {