Better detection and handling of errors during update.