Fix empty field detection

Empty fields will not brake teh validation.