Issue #25058:account for null tax