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;
     }