diff --git a/Oqtane.Client/Modules/Admin/Sites/Edit.razor b/Oqtane.Client/Modules/Admin/Sites/Edit.razor
index 34fda2bf..da99c044 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Edit.razor
@@ -304,7 +304,7 @@
                     SettingService.SetSetting(settings, "SMTPSSL", smtpssl);
                     SettingService.SetSetting(settings, "SMTPUsername", smtpusername);
                     SettingService.SetSetting(settings, "SMTPPassword", smtppassword);
-                    await SettingService.UpdateModuleSettingsAsync(settings, site.SiteId);
+                    await SettingService.UpdateSiteSettingsAsync(settings, site.SiteId);
 
                     await logger.LogInformation("Site Saved {Site}", site);
 
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;
                 }
diff --git a/Oqtane.Upgrade/Oqtane.Upgrade.csproj b/Oqtane.Upgrade/Oqtane.Upgrade.csproj
index 0ddddf67..3e32c64c 100644
--- a/Oqtane.Upgrade/Oqtane.Upgrade.csproj
+++ b/Oqtane.Upgrade/Oqtane.Upgrade.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">