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