From b012a0dcaafc45771cc76e0c17d089bd3d6ebef9 Mon Sep 17 00:00:00 2001
From: Pavel Vesely <pavel@vesely.dev>
Date: Sat, 8 Feb 2020 17:35:27 +0100
Subject: [PATCH] Missing nullchecks -> unhandled exceptions

---
 Oqtane.Client/Shared/ModuleInstance.razor | 20 +++++++++++++-------
 Oqtane.Client/Shared/SiteRouter.razor     |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Oqtane.Client/Shared/ModuleInstance.razor b/Oqtane.Client/Shared/ModuleInstance.razor
index c6ae4a23..8d563405 100644
--- a/Oqtane.Client/Shared/ModuleInstance.razor
+++ b/Oqtane.Client/Shared/ModuleInstance.razor
@@ -39,17 +39,23 @@
             if (typename != null)
             {
                 moduleType = Type.GetType(typename);
-            }
-            if (moduleType != null)
-            {
-                builder.OpenComponent(0, moduleType);
-                builder.CloseComponent();
+
+                if (moduleType != null)
+                {
+                    builder.OpenComponent(0, moduleType);
+                    builder.CloseComponent();
+                }
+                else
+                {
+                    // module does not exist with typename specified
+                    message = "Module Does Not Have A Component Named " + Utilities.GetTypeNameLastSegment(typename, 0) + ".razor";
+                }
             }
             else
             {
-                // module does not exist with typename specified
-                message = "Module Does Not Have A Component Named " + Utilities.GetTypeNameLastSegment(typename, 0) + ".razor";
+                message = "Something is wrong with moduletype";
             }
+
         };
     }
 
diff --git a/Oqtane.Client/Shared/SiteRouter.razor b/Oqtane.Client/Shared/SiteRouter.razor
index 4b63f2b6..95d67998 100644
--- a/Oqtane.Client/Shared/SiteRouter.razor
+++ b/Oqtane.Client/Shared/SiteRouter.razor
@@ -408,7 +408,7 @@
             if (module.PageId == pageid)
             {
                 // ensure module's pane exists in current page and if not, assign it to the Admin pane
-                if (!panes.ToLower().Contains(module.Pane.ToLower()))
+                if (panes == null || !panes.ToLower().Contains(module.Pane.ToLower()))
                 {
                     module.Pane = Constants.AdminPane;
                 }