Fixed NullPointerException, again...

Now it should compile, fuck my text editor :/
Merge pull request #47 from CelestialWalrus/patch-2

Fixed NullPointerException, again...