null pointer exception handled
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #1850 from ssushma/dev-branch

null pointer exception handled