Added some data validation based on recent support issues.