Add missing data checks