Issue #23593:correctly handle nulls in address
Merge pull request #1784 from garyhgohoos/23593-2

Issue #23593:correctly handle nulls in address