#375: data_validator.py, move more validation out of 'IF' statement