added some null checks for world gen