Null pointer exception has been handled.
Merge pull request #891 from shivalinga/master

Null pointer exception has been handled.