fix NullPointerException
Merge pull request #7 from litvinok/new

fix NullPointerException