Tried to fix NPE
Merge pull request #252 from squix78/DevBranch

Tried to fix NPE