Added a working @ExceptionHandler