diff --git a/MainProject.Tests/Controllers/AuthController_Tests.cs b/MainProject.Tests/Controllers/AuthController_Tests.cs
index 2326515..b978df6 100644
--- a/MainProject.Tests/Controllers/AuthController_Tests.cs
+++ b/MainProject.Tests/Controllers/AuthController_Tests.cs
@@ -102,7 +102,8 @@ public class AuthController_Tests
         {
             Data = null
         };
-        authServiceMock.Setup(s => s.AuthenticateAsync(It.IsAny<AuthenticateRequestData>())).ReturnsAsync((AuthenticatedUser)null);        
+        AuthenticatedUser authenticatedUser = null;
+        authServiceMock.Setup(s => s.AuthenticateAsync(It.IsAny<AuthenticateRequestData>())).ReturnsAsync(authenticatedUser);        
         ObjectResult response = (ObjectResult)(await controller.AuthenticateAsync(request));
 
         if(response != null && response.Value != null)
diff --git a/MainProject/Controllers/AuthController.cs b/MainProject/Controllers/AuthController.cs
index 69b39ac..25efe42 100644
--- a/MainProject/Controllers/AuthController.cs
+++ b/MainProject/Controllers/AuthController.cs
@@ -30,6 +30,11 @@ namespace BasicDotnetTemplate.MainProject.Controllers
         {
             try
             {
+                if (!ModelState.IsValid)
+                {
+                    return BadRequest("Request is not well formed");
+                }
+                
                 if (
                     request == null ||
                     request.Data == null ||