Make the validation on save and isolated from children