1 files changed, 6 insertions, 2 deletions
diff --git a/sonar-application/src/main/java/org/sonar/application/App.java b/sonar-application/src/main/java/org/sonar/application/App.java
index a2b63eab3e8..9be3956c795 100644
--- a/sonar-application/src/main/java/org/sonar/application/App.java
+++ b/sonar-application/src/main/java/org/sonar/application/App.java
@@ -124,8 +124,12 @@ public class App implements ProcessMXBean {
       logger.info("Shutting down server");
       monitor.interrupt();
       monitor = null;
-      elasticsearch.terminate();
-      server.terminate();
+      if (elasticsearch != null) {
+        elasticsearch.terminate();
+      }
+      if (server != null) {
+        server.terminate();
+      }
     }
   }