diff --git a/InvoiceReminder.API/Exceptions/GlobalExceptionHandler.cs b/InvoiceReminder.API/Exceptions/GlobalExceptionHandler.cs
index ba27e18..e8b1f21 100644
--- a/InvoiceReminder.API/Exceptions/GlobalExceptionHandler.cs
+++ b/InvoiceReminder.API/Exceptions/GlobalExceptionHandler.cs
@@ -20,7 +20,9 @@ public async ValueTask<bool> TryHandleAsync(HttpContext httpContext, Exception e
 
         httpContext.Response.StatusCode = exception switch
         {
-            ApplicationException => StatusCodes.Status400BadRequest,
+            ArgumentException or
+            ArgumentNullException or
+            BadHttpRequestException => StatusCodes.Status400BadRequest,
             _ => StatusCodes.Status500InternalServerError
         };