Fix NPE during some early world load sequences