added fix for null pointer expection
added fix for null pointer expection
Merge pull request #273 from sheebans/master

added fix for null pointer expection