Servant locator fixes

2 files changed, 4 insertions, 4 deletions

diff --git a/swift/src/Ice/Incoming.swift b/swift/src/Ice/Incoming.swift
index 32eb4273fbb..f4b53105e40 100644
--- a/swift/src/Ice/Incoming.swift
+++ b/swift/src/Ice/Incoming.swift
@@ -100,7 +100,7 @@ public final class Incoming {
             try locator.finished(curr: current, servant: servant, cookie: cookie)
             return true
         } catch {
-            exceptionCallback(convertException(error))
+            handleException(error)
         }
 
         return false
@@ -121,7 +121,7 @@ public final class Incoming {
                     let locatorReturn = try locator.locate(current)
                     (servant, cookie) = (locatorReturn.returnValue, locatorReturn.cookie)
                 } catch {
-                    exceptionCallback(convertException(error))
+                    handleException(error)
                     return
                 }
             }
@@ -224,7 +224,7 @@ public final class Incoming {
             return e
         case let exception as UserException:
             let e = ICEUnknownUserException()
-            e.unknown = "\(exception)"
+            e.unknown = "\(exception.ice_id())"
             return e
         // 3. Unknown exceptions
         default:
diff --git a/swift/src/Ice/ServantManager.swift b/swift/src/Ice/ServantManager.swift
index 2e251e9f40f..0eef747411e 100644
--- a/swift/src/Ice/ServantManager.swift
+++ b/swift/src/Ice/ServantManager.swift
@@ -137,7 +137,7 @@ class ServantManager {
 
     func removeServantLocator(category: String) throws -> ServantLocator {
         return try mutex.sync {
-            guard let l = locatorMap[category] else {
+            guard let l = locatorMap.removeValue(forKey: category) else {
                 let id = try escapeString(string: category, special: "", communicator: communicator)
                 throw NotRegisteredException(kindOfObject: "servant locator", id: id)
             }