Issue #21258:allow null default locations
Merge pull request #125 from garyhgohoos/21258

Issue #21258:allow null default locations