Issue #23593:correctly handle nulls in address