1 files changed, 10 insertions, 1 deletions
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs
index 378fc3eea..da5ce16f7 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs
@@ -285,7 +285,16 @@ namespace Tango.MachineService.Controllers
         [HttpPost]
         public LoginResponse Login(LoginRequest request)
         {
-            var authResult = _ad_manager.ValidateUserCredentials(request.Email, request.Password);
+            AuthenticationResult authResult = null;
+
+            try
+            {
+                authResult = _ad_manager.ValidateUserCredentials(request.Email, request.Password);
+            }
+            catch (Exception ex)
+            {
+                throw new AuthenticationException(ex.FlattenMessage());
+            }
 
             if (!_ad_manager.CanUserAccessCurrentEnvironment(request.Email))
             {