diff --git a/repository/src/main/java/org/apache/atlas/tasks/TaskRegistry.java b/repository/src/main/java/org/apache/atlas/tasks/TaskRegistry.java
index fae8a4f..32e0ad9 100644
--- a/repository/src/main/java/org/apache/atlas/tasks/TaskRegistry.java
+++ b/repository/src/main/java/org/apache/atlas/tasks/TaskRegistry.java
@@ -185,8 +185,16 @@
         ret.setType(v.getProperty(Constants.TASK_TYPE, String.class));
         ret.setStatus(v.getProperty(Constants.TASK_STATUS, String.class));
         ret.setCreatedBy(v.getProperty(Constants.TASK_CREATED_BY, String.class));
-        ret.setCreatedTime(new Date(v.getProperty(Constants.TASK_CREATED_TIME, Long.class)));
-        ret.setUpdatedTime(new Date(v.getProperty(Constants.TASK_UPDATED_TIME, Long.class)));
+
+        Long createdTime = v.getProperty(Constants.TASK_CREATED_TIME, Long.class);
+        if (createdTime != null) {
+            ret.setCreatedTime(new Date(createdTime));
+        }
+
+        Long updatedTime = v.getProperty(Constants.TASK_UPDATED_TIME, Long.class);
+        if (updatedTime != null) {
+            ret.setUpdatedTime(new Date(updatedTime));
+        }
 
         Long startTime = v.getProperty(Constants.TASK_START_TIME, Long.class);
         if (startTime != null) {