diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
index 4c6d54641..f37debe7b 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
@@ -199,7 +199,10 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment {
         }else if(layoutManager instanceof GridLayoutManager){
             lastVisibleItemPosition=((GridLayoutManager)layoutManager).findLastCompletelyVisibleItemPosition();
         }
-        outState.putString(VISIBLE_ITEM_ID,findIdOfItemWithPosition(lastVisibleItemPosition));
+        String idOfItemWithPosition = findIdOfItemWithPosition(lastVisibleItemPosition);
+        if (null != idOfItemWithPosition) {
+            outState.putString(VISIBLE_ITEM_ID, idOfItemWithPosition);
+        }
     }
 
     @Override
@@ -216,8 +219,13 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment {
      * @param position
      * @return
      */
+    @Nullable
     private String findIdOfItemWithPosition(int position) {
-        return callback.getContributionForPosition(position).getContentUri().getLastPathSegment();
+        Contribution contributionForPosition = callback.getContributionForPosition(position);
+        if (null != contributionForPosition) {
+            return contributionForPosition.getContentUri().getLastPathSegment();
+        }
+        return null;
     }
 
 }