Changes to updates framework to support proper error management