Only validate fields that actually exist