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

null handling implemented
Merge remote-tracking branch 'upstream/dev-branch' into dev-branch