Added some returned data validation.