Issue #21371:account for null and freeform address
Merge pull request #69 from garyhgohoos/21371

21371