Modify error handling.