From 8d5eee316e75fc5b1626aea9d2a6237020ab8e98 Mon Sep 17 00:00:00 2001
From: Aravindan Ramkumar <1028385+aravindanr@users.noreply.github.com>
Date: Tue, 19 Apr 2022 15:10:42 -0700
Subject: [PATCH] #2926 added a null check for TaskModel

---
 .../com/netflix/conductor/core/dal/ExecutionDAOFacade.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/com/netflix/conductor/core/dal/ExecutionDAOFacade.java b/core/src/main/java/com/netflix/conductor/core/dal/ExecutionDAOFacade.java
index bf635be408..5b905a2853 100644
--- a/core/src/main/java/com/netflix/conductor/core/dal/ExecutionDAOFacade.java
+++ b/core/src/main/java/com/netflix/conductor/core/dal/ExecutionDAOFacade.java
@@ -449,7 +449,9 @@ public List<Task> getTasksForWorkflow(String workflowId) {
 
     public TaskModel getTaskModel(String taskId) {
         TaskModel taskModel = getTaskFromDatastore(taskId);
-        populateTaskData(taskModel);
+        if (taskModel != null) {
+            populateTaskData(taskModel);
+        }
         return taskModel;
     }