diff --git a/src/Api/Utilities/ExceptionHandlerFilterAttribute.cs b/src/Api/Utilities/ExceptionHandlerFilterAttribute.cs
index 742244b624..a7454eb5a6 100644
--- a/src/Api/Utilities/ExceptionHandlerFilterAttribute.cs
+++ b/src/Api/Utilities/ExceptionHandlerFilterAttribute.cs
@@ -49,6 +49,11 @@ namespace Bit.Api.Utilities
                 errorModel.Message = exception.Message;
                 context.HttpContext.Response.StatusCode = 400;
             }
+            else if(exception is NotSupportedException && !string.IsNullOrWhiteSpace(exception.Message))
+            {
+                errorModel.Message = exception.Message;
+                context.HttpContext.Response.StatusCode = 400;
+            }
             else if(exception is ApplicationException)
             {
                 context.HttpContext.Response.StatusCode = 402;