Fix validation of not required fields.
Fix validation of not required fields.

Replace early return with second `if`.

vogdb/cm,fauvel/CM,vogdb/cm,njam/CM,tomaszdurka/CM,tomaszdurka/CM,zazabe/cm,alexispeter/CM,mariansollmann/CM,fauvel/CM,fauvel/CM,zazabe/cm,tomaszdurka/CM,zazabe/cm,cargomedia/CM,fvovan/CM,njam/CM,tomaszdurka/CM,zazabe/cm,tomaszdurka/CM,fvovan/CM,alexispeter/CM,alexispeter/CM,fvovan/CM,vogdb/cm,cargomedia/CM,mariansollmann/CM,fvovan/CM,fauvel/CM,fauvel/CM,cargomedia/CM,njam/CM,cargomedia/CM,njam/CM,vogdb/cm,vogdb/cm,alexispeter/CM,mariansollmann/CM,njam/CM,mariansollmann/CM