Fix zone name sometimes being nil