Avoid very silly NPE
Merge pull request #82 from coopdevs/hotfix/stupid-me-NPE

Avoid very silly NPE