diff --git a/MediaBrowser.Common/UI/BaseApplication.cs b/MediaBrowser.Common/UI/BaseApplication.cs
index a6bc7f7e49..6285ca7ae3 100644
--- a/MediaBrowser.Common/UI/BaseApplication.cs
+++ b/MediaBrowser.Common/UI/BaseApplication.cs
@@ -16,6 +16,7 @@ namespace MediaBrowser.Common.UI
 
         protected async override void OnStartup(StartupEventArgs e)
         {
+            // Without this the app will shutdown after the splash screen closes
             this.ShutdownMode = ShutdownMode.OnExplicitShutdown;
 
             await LoadKernel();
@@ -48,6 +49,8 @@ namespace MediaBrowser.Common.UI
             {
                 MessageBox.Show("There was an error launching Media Browser: " + ex.Message);
                 splash.Close();
+
+                // Shutdown the app with an error code
                 Shutdown(1);
             }
         }