first commit
second commit
Merge pull request #1150 from smotru/master

null pointer exception PR