diff --git a/BeWoLauncher/Logic/Controller/ProcessController.cs b/BeWoLauncher/Logic/Controller/ProcessController.cs
index bc446ba66..369c1fec4 100644
--- a/BeWoLauncher/Logic/Controller/ProcessController.cs
+++ b/BeWoLauncher/Logic/Controller/ProcessController.cs
@@ -22,13 +22,38 @@ namespace BeWoLauncher.Logic.Controller
 
         internal static void CheckForOtherInstance()
         {
-            string message = "Möchten Sie es schließen? Dadurch können nicht gespeicherte Daten verloren gehen.";
-            string caption = "BeWo Anwendung läuft bereits. ";
+            string procName = Process.GetCurrentProcess().ProcessName;
 
-            Action show_error = () =>
+            Process[] processes = Process.GetProcessesByName(procName);
+
+            if (processes.Length > 1)
             {
+                HandleProzessAlreadyRunning(false);
+                return;
+            }
+
+            Process[] processes2 = Process.GetProcessesByName("BeWoPlaner");
+
+            if (processes2.Length > 0)
+            {
+                HandleProzessAlreadyRunning(false);
+                return;
+            }
+        }
+
+        internal static void HandleProzessAlreadyRunning(bool letUserKill)
+        {
+#if DEBUG
+            letUserKill = true;
+#endif
+
+            if (letUserKill)
+            {
+                string message = "Möchten Sie es schließen? Dadurch können nicht gespeicherte Daten verloren gehen.";
+                string caption = "BeWo Anwendung läuft bereits. ";
+
                 var result = MessageBox.Show(message, caption, MessageBoxButton.YesNo);
-                
+
                 if (result == MessageBoxResult.Yes)
                 {
                     var own_process_id = Process.GetCurrentProcess().Id;
@@ -41,24 +66,15 @@ namespace BeWoLauncher.Logic.Controller
                 {
                     StartLauncherShutdown();
                 }
-            };
-
-            string procName = Process.GetCurrentProcess().ProcessName;
-
-            Process[] processes = Process.GetProcessesByName(procName);
-
-            if (processes.Length > 1)
-            {
-                show_error();
-                return;
             }
-
-            Process[] processes2 = Process.GetProcessesByName("BeWoPlaner");
-
-            if (processes2.Length > 0)
+            else
             {
-                show_error();
-                return;
+                string message = "Möchten Sie es schließen? Dadurch können nicht gespeicherte Daten verloren gehen.";
+                string caption = "BeWo Anwendung läuft bereits. ";
+
+                MessageBox.Show(message, caption);
+
+                StartLauncherShutdown();
             }
         }
 
diff --git a/Service/ServiceImplementations/DownloadBeWoServiceImp.cs b/Service/ServiceImplementations/DownloadBeWoServiceImp.cs
index aee5b90d8..d141cfa69 100644
--- a/Service/ServiceImplementations/DownloadBeWoServiceImp.cs
+++ b/Service/ServiceImplementations/DownloadBeWoServiceImp.cs
@@ -131,7 +131,6 @@ namespace BeWo.Service.ServiceImplementations
                 server_address = "http://localhost:3777/Host";
 #endif
 
-
                 ServiceFacade.UpdateServerAddresses(server_address);
 
                 var result = ServiceFacade.DoLauncherServiceSync(x => x.IsUserValid(username, password, pin, clientid, true));