"Fix" a NPE

I don't know why this happens yet, but it crashes servers.