diff --git a/src/ScadaLink.CentralUI/Components/Pages/Admin/DataConnectionForm.razor b/src/ScadaLink.CentralUI/Components/Pages/Admin/DataConnectionForm.razor
index 20a20d7..b3aada6 100644
--- a/src/ScadaLink.CentralUI/Components/Pages/Admin/DataConnectionForm.razor
+++ b/src/ScadaLink.CentralUI/Components/Pages/Admin/DataConnectionForm.razor
@@ -121,11 +121,11 @@
 
     protected override async Task OnInitializedAsync()
     {
-        _sites = (await SiteRepository.GetAllSitesAsync()).ToList();
-
-        if (Id.HasValue)
+        try
         {
-            try
+            _sites = (await SiteRepository.GetAllSitesAsync()).ToList();
+
+            if (Id.HasValue)
             {
                 _editingConnection = await SiteRepository.GetDataConnectionByIdAsync(Id.Value);
                 if (_editingConnection != null)
@@ -147,23 +147,25 @@
                     }
                 }
             }
-            catch (Exception ex)
+            else if (SiteId.HasValue)
             {
-                _formError = $"Failed to load connection: {ex.Message}";
+                var site = _sites.FirstOrDefault(s => s.Id == SiteId.Value);
+                if (site != null)
+                {
+                    _formSiteId = site.Id;
+                    _siteName = site.Name;
+                    _siteLocked = true;
+                }
             }
         }
-        else if (SiteId.HasValue)
+        catch (Exception ex)
         {
-            var site = _sites.FirstOrDefault(s => s.Id == SiteId.Value);
-            if (site != null)
-            {
-                _formSiteId = site.Id;
-                _siteName = site.Name;
-                _siteLocked = true;
-            }
+            _formError = $"Failed to load: {ex.Message}";
+        }
+        finally
+        {
+            _loading = false;
         }
-
-        _loading = false;
     }
 
     private async Task SaveConnection()