diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java
index 8cf8f52fb20e059d9ae5cc8575443b0256baca8d..06e5275b4d149b0e89b009ef46cba59a910941e7 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java
@@ -2,6 +2,7 @@ package edu.kit.ipd.descartes.adaptation;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Properties;
 
@@ -95,19 +96,24 @@ public class AdaptationControl {
 
             // load required models, use absolute paht (http://www.jevon.org/wiki/Resolving_Proxy_EMF_Elements)
             adaptationProcess = adaptationProcessModelLoader.load(URI.createFileURI(new File(
-                    adaptationProcessXmiFilePath).getAbsolutePath()));
+            		adaptationProcessXmiFilePath).getAbsolutePath()));
             perfDataRepoHandler = PerformanceDataRepositoryHandlerFactory.createHandler(pdrMetamodelType);
             perfDataRepoHandler.load(performanceDataRepoXmiFilePath);
-
+            
             // set handlers
             dmmModelActionHandler = new DmmModelActionHandler();
             executor = new TacticExecutor(dmmModelActionHandler);
             modelAnalyzer = new PcmModelAnalyzer(perfDataRepoHandler);
             evaluator = new WeightingFunctionEvaluator();
+            
+        } catch (FileNotFoundException e) {
+        	logger.error("Properties file " + propertiesFile + " could not be found.");
+        	abort();
         } catch (IOException e) {
             logger.error("Error while initializinig controller.", e);
             abort();
         }
+        
     }
 
     public void doAdaptation(Event event) {
@@ -234,7 +240,7 @@ public class AdaptationControl {
      */
     public void stop() {
         logger.info("Stopping adaptation process");
-        return;
+        System.exit(0);
     }
 
     /**