Fixed: NPE on shutdown if not using WorldManager

This is only a temporary fix; a better change will be made at a later date.