1 files changed, 11 insertions, 0 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs
index 486829103..5598362be 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LoadingViewVM.cs
@@ -54,6 +54,17 @@ namespace Tango.PPC.UI.ViewModels
             {
                 Task.Delay(1000).ContinueWith((x) => { IsLoading = true; });
             }
+
+            applicationManager.ApplicationInitializationError += ApplicationManager_ApplicationInitializationError;
+        }
+
+        private void ApplicationManager_ApplicationInitializationError(object sender, Exception ex)
+        {
+            InvokeUI(() =>
+            {
+                NavigationManager.NavigateWithObject<Exception>(NavigationView.LoadingErrorView, ex);
+                IsLoading = false;
+            });
         }
 
         /// <summary>