From f20ede8267ca9fd9c408bcfa367c0c27a94af662 Mon Sep 17 00:00:00 2001
From: da3dsoul <da3dsoul@gmail.com>
Date: Mon, 26 Dec 2016 23:49:38 -0500
Subject: [PATCH] Fix NullPointer

---
 JMMServer/ServerSettings.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/JMMServer/ServerSettings.cs b/JMMServer/ServerSettings.cs
index a884859fd..af8c93a3d 100644
--- a/JMMServer/ServerSettings.cs
+++ b/JMMServer/ServerSettings.cs
@@ -158,7 +158,8 @@ public static void LoadSettingsFromFile(string tmp_setting_file, bool delete_tmp
                     {
                         MessageBox.Show(Properties.Resources.Migration_AdminFail, Properties.Resources.Migration_Header,
                             MessageBoxButton.OK, MessageBoxImage.Information);
-                        MainWindow.Instance.ApplicationShutdown();
+	                    // This should be okay, since we are still in MainWindow Init
+                        Application.Current.Shutdown();
                         return;
                     }