Added ? null checks
Added ? null checks

endeavourhealth-discovery/Data-Validation,endeavourhealth-discovery/Data-Validation,endeavourhealth-discovery/Data-Validation,endeavourhealth-discovery/Data-Validation