Better update error handling