Fix issue with null values and missing DataProvider property