diff --git a/src/Bulwark.Auth/Controllers/AuthenticationController.cs b/src/Bulwark.Auth/Controllers/AuthenticationController.cs
index d19822a..6f332dc 100644
--- a/src/Bulwark.Auth/Controllers/AuthenticationController.cs
+++ b/src/Bulwark.Auth/Controllers/AuthenticationController.cs
@@ -30,7 +30,7 @@ public async Task<ActionResult<Authenticated>>
         {
             return await _auth.Authenticate(payload.Email, payload.Password);
         }
-        catch(BulwarkAuthenticationException exception)
+        catch(Exception exception)
         {
             return Problem(
                 title: "Bad Input",
@@ -73,7 +73,7 @@ await _auth.Acknowledge(authenticated,
                 validate.Token, validate.DeviceId);
             return token;
         }
-        catch (BulwarkTokenException exception)
+        catch (Exception exception)
         {
             return Problem(
                 title: "Invalid Token",
@@ -94,14 +94,6 @@ public async Task<ActionResult<Authenticated>> RenewCredentials(RefreshToken pay
 
             return authenticated;
         }
-        catch (BulwarkTokenExpiredException exception)
-        {
-            return Problem(
-                title: "Refresh Expired Token",
-                detail: exception.Message,
-                statusCode: StatusCodes.Status422UnprocessableEntity
-            );
-        }
         catch (BulwarkTokenException exception)
         {
             return Problem(
@@ -123,7 +115,7 @@ await _auth.Revoke(validate.Email,
 
             return NoContent();
         }
-        catch (BulwarkTokenException exception)
+        catch (Exception exception)
         {
             return Problem(
                 title: "Can not revoke",