oops...
Update error handling.