null handling implemented
Merge pull request #1677 from ssushma/dev-branch

null handling implemented