[PDI-10610]: locator exception handling additions