diff --git a/BTCPayServer.Tests/Extensions.cs b/BTCPayServer.Tests/Extensions.cs
index 56c5c8923..77e41c481 100644
--- a/BTCPayServer.Tests/Extensions.cs
+++ b/BTCPayServer.Tests/Extensions.cs
@@ -28,10 +28,13 @@ namespace BTCPayServer.Tests
 
         public static void AssertNoError(this IWebDriver driver)
         {
-            if (!driver.PageSource.Contains("alert-danger"))
-                return;
-            foreach (var dangerAlert in driver.FindElements(By.ClassName("alert-danger")))
-                Assert.False(dangerAlert.Displayed, $"No alert should be displayed, but found this on {driver.Url}: {dangerAlert.Text}");
+            if (driver.PageSource.Contains("alert-danger"))
+            {
+                foreach (var dangerAlert in driver.FindElements(By.ClassName("alert-danger")))
+                    Assert.False(dangerAlert.Displayed, $"No alert should be displayed, but found this on {driver.Url}: {dangerAlert.Text}");
+            }
+            Assert.DoesNotContain("Access denied</h", driver.PageSource);
+            Assert.DoesNotContain("Page not found</h", driver.PageSource);
         }
 
         public static T AssertViewModel<T>(this IActionResult result)
diff --git a/BTCPayServer/Security/CookieAuthorizationHandler.cs b/BTCPayServer/Security/CookieAuthorizationHandler.cs
index b74709964..b6212f293 100644
--- a/BTCPayServer/Security/CookieAuthorizationHandler.cs
+++ b/BTCPayServer/Security/CookieAuthorizationHandler.cs
@@ -68,13 +68,12 @@ namespace BTCPayServer.Security
             if (routeData != null)
             {
                 // resolve from app
-                if (routeData.Values.TryGetValue("appId", out var vAppId))
+                if (routeData.Values.TryGetValue("appId", out var vAppId) && vAppId is string appId)
                 {
-                    string appId = vAppId as string;
                     app = await _appService.GetAppDataIfOwner(userId, appId);
                     if (storeId == null)
                     {
-                        storeId = app?.StoreDataId;
+                        storeId = app?.StoreDataId ?? String.Empty;
                     }
                     else if (app?.StoreDataId != storeId)
                     {
@@ -82,13 +81,12 @@ namespace BTCPayServer.Security
                     }
                 }
                 // resolve from payment request
-                if (routeData.Values.TryGetValue("payReqId", out var vPayReqId))
+                if (routeData.Values.TryGetValue("payReqId", out var vPayReqId) && vPayReqId is string payReqId)
                 {
-                    string payReqId = vPayReqId as string;
                     paymentRequest = await _paymentRequestRepository.FindPaymentRequest(payReqId, userId);
                     if (storeId == null)
                     {
-                        storeId = paymentRequest?.StoreDataId;
+                        storeId = paymentRequest?.StoreDataId ?? String.Empty;
                     }
                     else if (paymentRequest?.StoreDataId != storeId)
                     {
@@ -96,13 +94,12 @@ namespace BTCPayServer.Security
                     }
                 }
                 // resolve from invoice
-                if (routeData.Values.TryGetValue("invoiceId", out var vInvoiceId))
+                if (routeData.Values.TryGetValue("invoiceId", out var vInvoiceId) && vInvoiceId is string invoiceId)
                 {
-                    string invoiceId = vInvoiceId as string;
                     invoice = await _invoiceRepository.GetInvoice(invoiceId);
                     if (storeId == null)
                     {
-                        storeId = invoice?.StoreId;
+                        storeId = invoice?.StoreId ?? String.Empty;
                     }
                     else if (invoice?.StoreId != storeId)
                     {
@@ -117,6 +114,8 @@ namespace BTCPayServer.Security
                 storeId = _httpContext.GetUserPrefsCookie()?.CurrentStoreId;
             }
 
+            if (string.IsNullOrEmpty(storeId))
+                storeId = null;
             if (storeId != null)
             {
                 store = await _storeRepository.FindStore(storeId, userId);