More Validation for Edit Mode