Added null checks for WorldMap