Update error handling