Some extra data validation

Just in case.