diff --git a/src/java/azkaban/executor/ExecutableFlow.java b/src/java/azkaban/executor/ExecutableFlow.java
index c8e7080..73129d2 100644
--- a/src/java/azkaban/executor/ExecutableFlow.java
+++ b/src/java/azkaban/executor/ExecutableFlow.java
@@ -298,8 +298,9 @@ public class ExecutableFlow {
exFlow.endTime = getLongFromObject(flowObj.get("endTime"));
exFlow.flowStatus = Status.valueOf((String)flowObj.get("status"));
exFlow.submitUser = (String)flowObj.get("submitUser");
- exFlow.flowParameters = new HashMap<String, String>((Map<String,String>)flowObj.get("flowParameters"));
-
+ if (flowObj.containsKey("flowParameters")) {
+ exFlow.flowParameters = new HashMap<String, String>((Map<String,String>)flowObj.get("flowParameters"));
+ }
// Failure notification
if (flowObj.containsKey("notifyOnFirstFailure")) {
exFlow.notifyOnFirstFailure = (Boolean)flowObj.get("notifyOnFirstFailure");