Added exception unwrapping and renamed back locator service