Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
null pointer exception has been handled.
Merge pull request #853 from shivalinga/dev-branch

null pointer exception has been handled.