[PDI-10610]: locator exception handling additions

Changes coming for metaverse that coincide with this pull request.