ref #4028 - improve validation on save