Fixed possible NPE
Merge pull request #1203 from TheTemportalist/master

Fixed possible NPE