Issue #25058:account for null tax
Merge pull request #2055 from garyhgohoos/25058

Issue #25058:account for null tax