Fix issue with null values and missing DataProvider property
Merge pull request #5 from codemix/fix-null-issue

Fix issue with null values and missing DataProvider property