Leave model properties as "modified" if save fails

Replacement for #2508 targeted at master