diff --git a/src/java/azkaban/executor/ExecutorManager.java b/src/java/azkaban/executor/ExecutorManager.java
index 90ea1bc..a53015a 100644
--- a/src/java/azkaban/executor/ExecutorManager.java
+++ b/src/java/azkaban/executor/ExecutorManager.java
@@ -370,6 +370,9 @@ public class ExecutorManager {
List<Integer> running = getRunningFlows(projectId, flowId);
ExecutionOptions options = exflow.getExecutionOptions();
+ if (options == null) {
+ options = new ExecutionOptions();
+ }
if (options.getDisabledJobs() != null) {
// Disable jobs
diff --git a/src/java/azkaban/scheduler/ScheduleManager.java b/src/java/azkaban/scheduler/ScheduleManager.java
index d1bbd6d..586bfab 100644
--- a/src/java/azkaban/scheduler/ScheduleManager.java
+++ b/src/java/azkaban/scheduler/ScheduleManager.java
@@ -378,6 +378,9 @@ public class ScheduleManager {
exflow.setProxyUsers(project.getProxyUsers());
ExecutionOptions flowOptions = runningSched.getExecutionOptions();
+ if(flowOptions == null) {
+ flowOptions = new ExecutionOptions();
+ }
exflow.setExecutionOptions(flowOptions);
try {
