Make DeferredUpdates exception handling more robust