gh-1594 non-required validated fields can become undefined
Merge pull request #2456 from alabid/gh-1594

gh-1594 non-required validated fields can become undefined