Quick, hacky fix to the NPE
Merge pull request #34 from NotGyro/master

Quick, hacky fix to the NPE