Fix validation of not required fields.

Replace early return with second `if`.