azkaban-developers

diff --git a/azkaban-common/src/main/java/azkaban/jobExecutor/JavaProcessJob.java b/azkaban-common/src/main/java/azkaban/jobExecutor/JavaProcessJob.java
index 7cf1a94..2b2b4a3 100644
--- a/azkaban-common/src/main/java/azkaban/jobExecutor/JavaProcessJob.java
+++ b/azkaban-common/src/main/java/azkaban/jobExecutor/JavaProcessJob.java
@@ -152,25 +152,27 @@ public class JavaProcessJob extends ProcessJob {
   }
 
   protected Pair<Long, Long> getProcMemoryRequirement() throws Exception {
-    Props azkabanProperties = AzkabanServer.getAzkabanProperties();
-    String maxXms = azkabanProperties.getString(DirectoryFlowLoader.JOB_MAX_XMS, DirectoryFlowLoader.MAX_XMS_DEFAULT);
-    String maxXmx = azkabanProperties.getString(DirectoryFlowLoader.JOB_MAX_XMX, DirectoryFlowLoader.MAX_XMX_DEFAULT);
-    long sizeMaxXms = azkaban.utils.Utils.parseMemString(maxXms);
-    long sizeMaxXmx = azkaban.utils.Utils.parseMemString(maxXmx);
-
     String strXms = getInitialMemorySize();
     String strXmx = getMaxMemorySize();
     long xms = azkaban.utils.Utils.parseMemString(strXms);
     long xmx = azkaban.utils.Utils.parseMemString(strXmx);
 
-    if (xms > sizeMaxXms) {
-      throw new Exception(String.format("%s: Xms value has exceeded the allowed limit (max Xms = %s)",
-              getId(), maxXms));
-    }
+    Props azkabanProperties = AzkabanServer.getAzkabanProperties();
+    if (azkabanProperties != null) {
+      String maxXms = azkabanProperties.getString(DirectoryFlowLoader.JOB_MAX_XMS, DirectoryFlowLoader.MAX_XMS_DEFAULT);
+      String maxXmx = azkabanProperties.getString(DirectoryFlowLoader.JOB_MAX_XMX, DirectoryFlowLoader.MAX_XMX_DEFAULT);
+      long sizeMaxXms = azkaban.utils.Utils.parseMemString(maxXms);
+      long sizeMaxXmx = azkaban.utils.Utils.parseMemString(maxXmx);
+
+      if (xms > sizeMaxXms) {
+        throw new Exception(String.format("%s: Xms value has exceeded the allowed limit (max Xms = %s)",
+                getId(), maxXms));
+      }
 
-    if (xmx > sizeMaxXmx) {
-      throw new Exception(String.format("%s: Xmx value has exceeded the allowed limit (max Xmx = %s)",
-              getId(), maxXms));
+      if (xmx > sizeMaxXmx) {
+        throw new Exception(String.format("%s: Xmx value has exceeded the allowed limit (max Xmx = %s)",
+                getId(), maxXms));
+      }
     }
 
     return new Pair<Long, Long>(xms, xmx);