ExceptionHandler is now more generic.