LP#1745462: avoid trying to validate empty fields