Fix NPE
Fixed Failure
Merge pull request #335 from lDiverse/master

Fix NPE