Refactor UpdateModelMixin.update

Reduce nesting, return early in error cases.
Remove unnecessary else
Merge pull request #1427 from Ian-Foote/refactor_update

Refactor UpdateModelMixin.update