azkaban-developers

diff --git a/azkaban-common/src/main/java/azkaban/project/ProjectManager.java b/azkaban-common/src/main/java/azkaban/project/ProjectManager.java
index 03c5594..029e81e 100644
--- a/azkaban-common/src/main/java/azkaban/project/ProjectManager.java
+++ b/azkaban-common/src/main/java/azkaban/project/ProjectManager.java
@@ -518,6 +518,8 @@ public class ProjectManager {
   }
 
   public void loadProjectWhiteList() {
-    ProjectWhitelist.load(props);
+    if (props.containsKey(ProjectWhitelist.XML_FILE_PARAM)) {
+      ProjectWhitelist.load(props);
+    }
   }
 }

diff --git a/azkaban-common/src/main/java/azkaban/project/ProjectWhitelist.java b/azkaban-common/src/main/java/azkaban/project/ProjectWhitelist.java
index 7381b6a..5d7998d 100644
--- a/azkaban-common/src/main/java/azkaban/project/ProjectWhitelist.java
+++ b/azkaban-common/src/main/java/azkaban/project/ProjectWhitelist.java
@@ -39,7 +39,7 @@ import azkaban.utils.Props;
  *
  */
 public class ProjectWhitelist {
-  private static final String XML_FILE_PARAM = "project.whitelist.xml.file";
+  static final String XML_FILE_PARAM = "project.whitelist.xml.file";
   private static final String PROJECT_WHITELIST_TAG = "ProjectWhitelist";
   private static final String PROJECT_TAG = "project";
   private static final String PROJECTNAME_ATTR = "projectname";