Added data check.