Add checks for missing data in json