Index: Application/Riskeer/src/Application.Riskeer/App.cs
===================================================================
diff -u -r57c7bff14ea79d4dc7196ad86323f2d300ecc589 -rf7aee065e3b5739b83fca8f9fc3c0b98f6d99170
--- Application/Riskeer/src/Application.Riskeer/App.cs	(.../App.cs)	(revision 57c7bff14ea79d4dc7196ad86323f2d300ecc589)
+++ Application/Riskeer/src/Application.Riskeer/App.cs	(.../App.cs)	(revision f7aee065e3b5739b83fca8f9fc3c0b98f6d99170)
@@ -114,8 +114,10 @@
             Resources.Add(SystemParameters.MenuPopupAnimationKey, PopupAnimation.None);
 
             WaitForPreviousInstanceToExit();
-            if (ShutdownIfNotFirstInstance())
+            if (IsNotFirstInstance())
             {
+                MessageBox.Show(CoreCommonGuiResources.App_ShutdownIfNotFirstInstance_Cannot_start_multiple_instances_of_Riskeer_Please_close_the_other_instance_first);
+                Shutdown(1);
                 return;
             }
 
@@ -241,7 +243,7 @@
         /// to write log files to the Riskeer user data folder. This method deletes the old log files
         /// that have been written there.
         /// </summary>
-        private void DeleteOldLogFiles()
+        private static void DeleteOldLogFiles()
         {
             try
             {
@@ -258,17 +260,15 @@
             }
         }
 
-        private bool ShutdownIfNotFirstInstance()
+        private static bool IsNotFirstInstance()
         {
             var hasMutex = false;
 
             try
             {
                 if (!AcquireSingleInstancePerUserMutex())
                 {
-                    MessageBox.Show(CoreCommonGuiResources.App_ShutdownIfNotFirstInstance_Cannot_start_multiple_instances_of_Riskeer_Please_close_the_other_instance_first);
-                    Shutdown(1);
-                    return true; //done here
+                    return true;
                 }
 
                 hasMutex = true;
Index: Application/Riskeer/src/Application.Riskeer/Logger.cs
===================================================================
diff -u -r1a89098ebd57234ccea9377c898203741a543cf2 -rf7aee065e3b5739b83fca8f9fc3c0b98f6d99170
--- Application/Riskeer/src/Application.Riskeer/Logger.cs	(.../Logger.cs)	(revision 1a89098ebd57234ccea9377c898203741a543cf2)
+++ Application/Riskeer/src/Application.Riskeer/Logger.cs	(.../Logger.cs)	(revision f7aee065e3b5739b83fca8f9fc3c0b98f6d99170)
@@ -34,7 +34,7 @@
     /// <summary>
     /// Class for managing the logging capabilities of Riskeer.
     /// </summary>
-    public class Logger
+    public static class Logger
     {
         /// <summary>
         /// Sets the configuration of the logger.