diff --git a/SchengenVisaApi/BlazorWebAssemblyVisaApiClient/ErrorHandling/GlobalErrorHandler.razor b/SchengenVisaApi/BlazorWebAssemblyVisaApiClient/ErrorHandling/GlobalErrorHandler.razor
index 91bcd9a..4ab6a17 100644
--- a/SchengenVisaApi/BlazorWebAssemblyVisaApiClient/ErrorHandling/GlobalErrorHandler.razor
+++ b/SchengenVisaApi/BlazorWebAssemblyVisaApiClient/ErrorHandling/GlobalErrorHandler.razor
@@ -1,4 +1,5 @@
 @using System.Net
+@using BlazorWebAssemblyVisaApiClient.Common.Exceptions
 @using VisaApiClient
 <CascadingValue Value="this">
     @ChildContent
@@ -13,7 +14,11 @@
 
     public void Handle(Exception ex)
     {
-        if (ex is ApiException<ProblemDetails> { StatusCode: (int)HttpStatusCode.Unauthorized or (int)HttpStatusCode.Forbidden })
+        if (ex is ApiException<ProblemDetails>
+            {
+                StatusCode: (int)HttpStatusCode.Unauthorized or (int)HttpStatusCode.Forbidden
+            }
+            or NotLoggedInException)
         {
             Nav.NavigateTo("/");
         }
diff --git a/SchengenVisaApi/BlazorWebAssemblyVisaApiClient/Pages/Applications.razor b/SchengenVisaApi/BlazorWebAssemblyVisaApiClient/Pages/Applications.razor
index 29eb31d..07babb2 100644
--- a/SchengenVisaApi/BlazorWebAssemblyVisaApiClient/Pages/Applications.razor
+++ b/SchengenVisaApi/BlazorWebAssemblyVisaApiClient/Pages/Applications.razor
@@ -1,4 +1,5 @@
 @page "/applications"
+@using BlazorWebAssemblyVisaApiClient.Common.Exceptions
 @using BlazorWebAssemblyVisaApiClient.Infrastructure.Helpers
 @using BlazorWebAssemblyVisaApiClient.Infrastructure.Services.UserDataProvider
 @using VisaApiClient
@@ -71,7 +72,7 @@
             {
                 Constants.ApplicantRole => (await Client.GetForApplicantAsync()).OrderByDescending(a => a.RequestDate).ToList(),
                 Constants.ApprovingAuthorityRole => (await Client.GetPendingAsync()).OrderByDescending(a => a.RequestDate).ToList(),
-                _ => throw new ArgumentOutOfRangeException()
+                _ => throw new NotLoggedInException()
             };
         }
         catch (Exception e)