1 files changed, 11 insertions, 4 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
index 8bb1c0fe3..206aa112b 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
@@ -342,10 +342,17 @@ namespace Tango.PPC.UI.PPCApplication
                         {
                             if (!Views.LayoutView.Instance.NavigationControl.Elements.ToList().Exists(m => m.GetType() == module.MainViewType))
                             {
-                                LogManager.Log("Loading module view " + module.Name + "...");
-                                FrameworkElement view = Activator.CreateInstance(module.MainViewType) as FrameworkElement;
-                                SharedUI.Controls.NavigationControl.SetNavigationName(view, module.Name);
-                                Views.LayoutView.Instance.NavigationControl.Elements.Add(view);
+                                try
+                                {
+                                    LogManager.Log("Loading module view " + module.Name + "...");
+                                    FrameworkElement view = Activator.CreateInstance(module.MainViewType) as FrameworkElement;
+                                    SharedUI.Controls.NavigationControl.SetNavigationName(view, module.Name);
+                                    Views.LayoutView.Instance.NavigationControl.Elements.Add(view);
+                                }
+                                catch (Exception ex)
+                                {
+                                    LogManager.Log(ex, $"Error loading module view for module {module.Name}.");
+                                }
                             }
                         }
                     });