Null pointer exception handled
Merge pull request #1457 from ssushma/dev-branch

Null pointer exception handled