Fixed issue when zoneId was null