diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/BaseController.java b/wise-webapp/src/main/java/com/wisemapping/rest/BaseController.java
index 9e7700b4..464b3b0d 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/BaseController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/BaseController.java
@@ -63,10 +63,16 @@ public class BaseController {
         return new RestErrors(ex.getErrors(), messageSource);
     }
 
-    @ExceptionHandler(com.wisemapping.exceptions.AccessDeniedSecurityException.class)
+    @ExceptionHandler(java.lang.reflect.UndeclaredThrowableException.class)
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     public RestErrors handleSecurityErrors(@NotNull ValidationException ex) {
         return new RestErrors(ex.getErrors(), messageSource);
     }
 
+    @ExceptionHandler(com.wisemapping.exceptions.AccessDeniedSecurityException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public RestErrors handleSecurity2Errors(@NotNull ValidationException ex) {
+        return new RestErrors(ex.getErrors(), messageSource);
+    }
+
 }