azkaban-aplcache

diff --git a/azkaban-web-server/src/main/java/azkaban/webapp/AzkabanWebServer.java b/azkaban-web-server/src/main/java/azkaban/webapp/AzkabanWebServer.java
index 6d527ae..9311157 100644
--- a/azkaban-web-server/src/main/java/azkaban/webapp/AzkabanWebServer.java
+++ b/azkaban-web-server/src/main/java/azkaban/webapp/AzkabanWebServer.java
@@ -235,17 +235,22 @@ public class AzkabanWebServer extends AzkabanServer {
 
       @Override
       public void run() {
-        if (webServer.scheduler != null) {
-          logger.info("Shutting down flow trigger scheduler...");
-          webServer.scheduler.shutdown();
+        try {
+          if (webServer.props.getBoolean(ConfigurationKeys.ENABLE_QUARTZ, false)) {
+            logger.info("Shutting down flow trigger scheduler...");
+            webServer.scheduler.shutdown();
+          }
+        } catch (final Exception e) {
+          logger.error("Exception while shutting down flow trigger service.", e);
         }
 
         try {
-          if (webServer.flowTriggerService != null) {
+          if (webServer.props.getBoolean(ConfigurationKeys.ENABLE_QUARTZ, false)) {
+            logger.info("Shutting down flow trigger service...");
             webServer.flowTriggerService.shutdown();
           }
         } catch (final Exception e) {
-          logger.error(("Exception while shutting down flow trigger service."), e);
+          logger.error("Exception while shutting down flow trigger service.", e);
         }
 
         try {
@@ -256,7 +261,7 @@ public class AzkabanWebServer extends AzkabanServer {
           webServer.close();
 
         } catch (final Exception e) {
-          logger.error(("Exception while shutting down web server."), e);
+          logger.error("Exception while shutting down web server.", e);
         }
 
         logger.info("kk thx bye.");