Better mngmt in validating empty fields, fix #2