Fix NPE with some worlds