diff --git a/full/src/main/java/de/ids_mannheim/korap/server/KustvaktServer.java b/full/src/main/java/de/ids_mannheim/korap/server/KustvaktServer.java
index b938904..024296f 100644
--- a/full/src/main/java/de/ids_mannheim/korap/server/KustvaktServer.java
+++ b/full/src/main/java/de/ids_mannheim/korap/server/KustvaktServer.java
@@ -39,12 +39,15 @@
         fullConfig = new FullConfiguration(properties);
         config = fullConfig;
 
+		if (kargs == null)
+			System.exit(0);
+
         if (kargs.getConfig() == null){
 //            BeansFactory.loadFileContext(kargs.getConfig());
-//        }
-//        else {
+//      }
+//      else {
             kargs.setConfig("default-config.xml");
-//            BeansFactory.loadClasspathContext("default-config.xml");
+//          BeansFactory.loadClasspathContext("default-config.xml");
         }
         kargs.setRootPackages(new String[] { "de.ids_mannheim.korap.web.utils",
                 "de.ids_mannheim.korap.web.service.full" });