SWITCHYARD-1922 - Making sure the model update is wrapped to avoid the

exception.