Index: Application/Riskeer/src/Application.Riskeer/App.xaml.cs
===================================================================
diff -u -r67530402a6e20a3f8c443c995d73e2d8b3b25744 -r1a394980ff51480c6e9636ab0cf3b55479795cd8
--- Application/Riskeer/src/Application.Riskeer/App.xaml.cs	(.../App.xaml.cs)	(revision 67530402a6e20a3f8c443c995d73e2d8b3b25744)
+++ Application/Riskeer/src/Application.Riskeer/App.xaml.cs	(.../App.xaml.cs)	(revision 1a394980ff51480c6e9636ab0cf3b55479795cd8)
@@ -81,7 +81,7 @@
 
         private static readonly ILog log = LogManager.GetLogger(typeof(App));
 
-        private static GuiCore gui;
+        private GuiCore gui;
         private static int waitForProcessId = -1;
         private static string fileToOpen = string.Empty;
 
@@ -109,7 +109,7 @@
         /// <summary>
         /// Runs the main Riskeer application.
         /// </summary>
-        private static void RunRiskeer()
+        private void RunRiskeer()
         {
             string loaderDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
             if (loaderDirectory != null)
@@ -298,19 +298,19 @@
             return createdNew;
         }
 
-        private static void AppDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
+        private void AppDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
         {
             Exception exception = e.ExceptionObject as Exception ?? new Exception(CoreCommonGuiResources.App_Unhandled_exception);
 
             HandleExceptionOnMainThread(exception);
         }
 
-        private static void Application_ThreadException(object sender, ThreadExceptionEventArgs e)
+        private void Application_ThreadException(object sender, ThreadExceptionEventArgs e)
         {
             HandleExceptionOnMainThread(e.Exception);
         }
 
-        private static void HandleExceptionOnMainThread(Exception exception)
+        private void HandleExceptionOnMainThread(Exception exception)
         {
             var control = (Control) gui.MainWindow.PropertyGrid;
 
@@ -325,7 +325,7 @@
             }
         }
 
-        private static void HandleException(Exception exception)
+        private void HandleException(Exception exception)
         {
             log.Error(CoreCommonGuiResources.App_Unhandled_exception, exception);