NPE fix (#44)
Merge pull request #45 from neueda/npefix

NPE fix (#44)