#374: data_validator.py, remove 'is not None'