diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
index d348ddb4..acd19670 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
@@ -55,20 +55,26 @@ else
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Loading Modules {Error}", ex.Message);
-            AddModuleMessage("Error Loading Modules", MessageType.Error);
+            if (_moduleDefinitions == null)
+            {
+                await logger.LogError(ex, "Error Loading Modules {Error}", ex.Message);
+                AddModuleMessage("Error Loading Modules", MessageType.Error);
+            }
         }
     }
 
     private bool UpgradeAvailable(string moduledefinitionname, string version)
     {
         var upgradeavailable = false;
-        var package = _packages.Where(item => item.PackageId == Utilities.GetTypeName(moduledefinitionname)).FirstOrDefault();
-        if (package != null)
+        if (_packages != null)
         {
-            upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0);
+            var package = _packages.Where(item => item.PackageId == Utilities.GetTypeName(moduledefinitionname)).FirstOrDefault();
+            if (package != null)
+            {
+                upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0);
+            }
+
         }
-        
         return upgradeavailable;
     }
 
@@ -86,7 +92,7 @@ else
             await logger.LogError(ex, "Error Downloading Module {ModuleDefinitionName} {Version} {Error}", moduledefinitionname, version, ex.Message);
             AddModuleMessage("Error Downloading Module", MessageType.Error);
         }
-  }
+    }
 
     private async Task DeleteModule(ModuleDefinition moduleDefinition)
     {
diff --git a/Oqtane.Client/Modules/Admin/Themes/Index.razor b/Oqtane.Client/Modules/Admin/Themes/Index.razor
index 4a3113b6..61076ca2 100644
--- a/Oqtane.Client/Modules/Admin/Themes/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Themes/Index.razor
@@ -4,7 +4,7 @@
 @inject IThemeService ThemeService
 @inject IPackageService PackageService
 
-@if (themes == null)
+@if (_themes == null)
 {
     <p><em>Loading...</em></p>
 }
@@ -12,7 +12,7 @@ else
 {
     <ActionLink Action="Add" Text="Install Theme" />
 
-    <Pager Items="@themes">
+    <Pager Items="@_themes">
         <Header>
             <th>&nbsp;</th>
             <th>Name</th>
@@ -39,41 +39,70 @@ else
 }
 
 @code {
-    private List<Theme> themes;
-    private List<Package> packages;
+    private List<Theme> _themes;
+    private List<Package> _packages;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnInitializedAsync()
     {
-        themes = await ThemeService.GetThemesAsync();
-        packages = await PackageService.GetPackagesAsync("module");
+        try
+        {
+            _themes = await ThemeService.GetThemesAsync();
+            _packages = await PackageService.GetPackagesAsync("theme");
+        }
+        catch (Exception ex)
+        {
+            if (_themes == null)
+            {
+                await logger.LogError(ex, "Error Loading Themes {Error}", ex.Message);
+                AddModuleMessage("Error Loading Themes", MessageType.Error);
+            }
+        }
     }
 
     private bool UpgradeAvailable(string themename, string version)
     {
         var upgradeavailable = false;
-        var package = packages.Where(item => item.PackageId == Utilities.GetTypeName(themename)).FirstOrDefault();
-        if (package != null)
+        if (_packages != null)
         {
-            upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0);
+            var package = _packages.Where(item => item.PackageId == Utilities.GetTypeName(themename)).FirstOrDefault();
+            if (package != null)
+            {
+                upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0);
+            }
         }
-        
         return upgradeavailable;
     }
 
     private async Task DownloadTheme(string themename, string version)
     {
-        await PackageService.DownloadPackageAsync(themename, version, "Themes");
-        await logger.LogInformation("Theme Downloaded {ThemeName} {Version}", themename, version);
-        await ThemeService.InstallThemesAsync();
-        NavigationManager.NavigateTo(NavigateUrl());
+        try
+        {
+            await PackageService.DownloadPackageAsync(themename, version, "Themes");
+            await ThemeService.InstallThemesAsync();
+            await logger.LogInformation("Theme Downloaded {ThemeName} {Version}", themename, version);
+            NavigationManager.NavigateTo(NavigateUrl());
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Downloading Theme {ThemeName} {Version} {Error}", themename, version, ex.Message);
+            AddModuleMessage("Error Downloading Theme", MessageType.Error);
+        }
     }
 
     private async Task DeleteTheme(Theme Theme)
     {
-        await ThemeService.DeleteThemeAsync(Theme.ThemeName);
-        await logger.LogInformation("Theme Deleted {Theme}", Theme);
-        NavigationManager.NavigateTo(NavigateUrl());
+        try
+        {
+            await ThemeService.DeleteThemeAsync(Theme.ThemeName);
+            await logger.LogInformation("Theme Deleted {Theme}", Theme);
+            NavigationManager.NavigateTo(NavigateUrl());
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Deleting Theme {Theme} {Error}", Theme, ex.Message);
+            AddModuleMessage("Error Deleting Theme", MessageType.Error);
+        }
     }
 }
\ No newline at end of file
diff --git a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
index 7ee95e30..cf446d82 100644
--- a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
@@ -43,28 +43,54 @@
 
     protected override async Task OnInitializedAsync()
     {
-        List<Package> packages = await PackageService.GetPackagesAsync("framework");
-        _package = packages.FirstOrDefault();
-        if (_package != null)
+        try
         {
-            _upgradeavailable = (Version.Parse(_package.Version).CompareTo(Version.Parse(Constants.Version)) > 0);
+            List<Package> packages = await PackageService.GetPackagesAsync("framework");
+            if (packages != null)
+            {
+                _package = packages.FirstOrDefault();
+                if (_package != null)
+                {
+                    _upgradeavailable = (Version.Parse(_package.Version).CompareTo(Version.Parse(Constants.Version)) > 0);
+                }
+                else
+                {
+                    _package = new Package { Name = Constants.PackageId, Version = Constants.Version };
+                }
+            }
         }
-        else
+        catch 
         {
-            _package = new Package { Name = Constants.PackageId, Version = Constants.Version };
+            // can be caused by no network connection
         }
     }
 
     private async Task Upgrade()
     {
-        await InstallationService.Upgrade();
-        NavigationManager.NavigateTo(NavigateUrl());
+        try
+        {
+            await InstallationService.Upgrade();
+            NavigationManager.NavigateTo(NavigateUrl());
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Executing Upgrade {Error}", ex.Message);
+            AddModuleMessage("Error Executing Upgrade", MessageType.Error);
+        }
     }
 
     private async Task Download(string packageid, string version)
     {
-        await PackageService.DownloadPackageAsync(packageid, version, "Framework");
-        await InstallationService.Upgrade();
-        NavigationManager.NavigateTo(NavigateUrl());
+        try
+        {
+            await PackageService.DownloadPackageAsync(packageid, version, "Framework");
+            await InstallationService.Upgrade();
+            NavigationManager.NavigateTo(NavigateUrl());
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Downloading Framework {Error}", ex.Message);
+            AddModuleMessage("Error Downloading Framework", MessageType.Error);
+        }
     }
 }