Re-add ExceptionHandlerAdvice