diff --git a/commons/src/main/java/fr/free/nrw/commons/caching/CacheController.java b/commons/src/main/java/fr/free/nrw/commons/caching/CacheController.java
index 27259bb5f..b178b1ba8 100644
--- a/commons/src/main/java/fr/free/nrw/commons/caching/CacheController.java
+++ b/commons/src/main/java/fr/free/nrw/commons/caching/CacheController.java
@@ -46,8 +46,8 @@ public class CacheController {
         ArrayList displayCatList = new ArrayList();
         Log.d("Cache", "Points found in quadtree: " + pointsFound);
 
-        ArrayList<String> flatCatList = null;
-        //TODO: Make this return a proper flat array
+        ArrayList<String> flatCatList = new ArrayList<String>();
+
         if (pointsFound.length != 0) {
 
             Log.d("Cache", "Entering for loop");
diff --git a/commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java b/commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
index b0f0ebf79..8186036bf 100644
--- a/commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
+++ b/commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
@@ -211,6 +211,7 @@ public  class       ShareActivity
                 List displayCatList = cacheObj.cacheData.findCategory();
 
                 //if no categories found in cache, call MW API to match image coords with nearby Commons categories
+
                 if (displayCatList.size() == 0) {
                     apiCall.request(decimalCoords);
                     Log.d("Cache", "displayCatList size 0, calling MWAPI" + displayCatList.toString());