Fix NullPointerException
Merge pull request #94 from fluxroot/fix-null-pointer

Fix NullPointerException