From 7ce7000a7f926346f0f945530d2af17b57a32f85 Mon Sep 17 00:00:00 2001
From: Shubham Goyal <shubham1g5@gmail.com>
Date: Thu, 5 Dec 2024 16:24:54 +0530
Subject: [PATCH] Null Handling

---
 app/src/org/commcare/tasks/EntityLoaderTask.java | 4 ++++
 1 file changed, 4 insertions(+)

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;