Completed error handling