Make custom exception handler more explicitly named