[minor] Rather than duplicate almost the whole method, add a null switch for availabilityZone?