Move cancelSave() out of the conditional