[PDI-10610]: locator exception handling additions
Merge pull request #1834 from gretchiemoran/metaverse

[PDI-10610]: locator exception handling additions