Don't fail with NullPointerException
Merge pull request #33 from forki/patch-2

Don't fail with NullPointerException