Only validate fields that actually exist
Changed a comment style.