Hotfix for the NPE fix

Funky things are funky.