Hopefully fixed a nullpointer on world load