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

Analytics null handling implemented