diff --git a/ors-api/src/main/java/org/heigit/ors/api/servlet/listeners/ORSInitContextListener.java b/ors-api/src/main/java/org/heigit/ors/api/servlet/listeners/ORSInitContextListener.java
index 73b2f851b1..5d790024dd 100644
--- a/ors-api/src/main/java/org/heigit/ors/api/servlet/listeners/ORSInitContextListener.java
+++ b/ors-api/src/main/java/org/heigit/ors/api/servlet/listeners/ORSInitContextListener.java
@@ -68,7 +68,7 @@ public void contextInitialized(ServletContextEvent contextEvent) {
                 }
                 if (Boolean.TRUE.equals(engineProperties.getPreparationMode())) {
                     LOGGER.info("Running in preparation mode, all enabled graphs are built, job is done.");
-                    RoutingProfileManagerStatus.setShutdown(true);
+                    System.exit(RoutingProfileManagerStatus.hasFailed() ? 1 : 0);
                 }
             } catch (Exception e) {
                 LOGGER.warn("Unable to initialize ORS due to an unexpected exception: " + e);