Revise error handling.