Attempt to improve error handling for the first time