Fix null dereference
Merge pull request #216 from siegi/npe-fix

Fix null dereference