Derp #4 - NPE should be gone now
* hopefully