Changed ExceptionHandler API