diff --git a/app/src/org/commcare/tasks/EntityLoaderTask.java b/app/src/org/commcare/tasks/EntityLoaderTask.java
index 2681b3783..2f4b6ac58 100644
--- a/app/src/org/commcare/tasks/EntityLoaderTask.java
+++ b/app/src/org/commcare/tasks/EntityLoaderTask.java
@@ -59,6 +59,10 @@ protected void onPostExecute(Pair<List<Entity<TreeReference>>, List<TreeReferenc
                         return;
                     }
 
+                    if (result == null) {
+                        return;
+                    }
+
                     listener.deliverLoadResult(result.first, result.second, entityLoaderHelper.getFactory(),
                             entityLoaderHelper.getFocusTargetIndex());
                     return;