Null pointer exception has been handled.
Merge pull request #1595 from shivalinga/dev-branch

Null pointer exception has been handled.