Fix handling of canceled updates.
4 files changed