Adjusting error handling.