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 df2257896..471b3c979 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
@@ -49,6 +49,7 @@ public class ContributionsListFragment extends Fragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View v = inflater.inflate(R.layout.fragment_contributions, container, false);
 
+
         contributionsList = (GridView) v.findViewById(R.id.contributionsList);
         waitingMessage = (TextView) v.findViewById(R.id.waitingMessage);
         emptyMessage = (TextView) v.findViewById(R.id.emptyMessage);
@@ -83,6 +84,9 @@ public class ContributionsListFragment extends Fragment {
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
+        if (outState == null) {
+            outState = new Bundle();
+        }
         super.onSaveInstanceState(outState);
         controller.saveState(outState);
         outState.putInt("grid-position", contributionsList.getFirstVisiblePosition());
@@ -188,6 +192,7 @@ public class ContributionsListFragment extends Fragment {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        controller = new fr.free.nrw.commons.contributions.ContributionController(this);
         setHasOptionsMenu(true);
     }
 
@@ -199,8 +204,6 @@ public class ContributionsListFragment extends Fragment {
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-
-        controller = new fr.free.nrw.commons.contributions.ContributionController(this);
         controller.loadState(savedInstanceState);
     }