1 files changed, 10 insertions, 2 deletions
diff --git a/swift/src/IceObjc/ObjectAdapter.mm b/swift/src/IceObjc/ObjectAdapter.mm
index 7268996c0b5..d2a5dfec592 100644
--- a/swift/src/IceObjc/ObjectAdapter.mm
+++ b/swift/src/IceObjc/ObjectAdapter.mm
@@ -204,9 +204,17 @@
     }
 }
 
--(dispatch_queue_t) getDispatchQueue
+-(dispatch_queue_t) getDispatchQueue:(NSError* _Nullable * _Nullable)error
 {
-    return self.objectAdapter->getDispatchQueue();
+    try
+    {
+        return self.objectAdapter->getDispatchQueue();
+    }
+    catch(const std::exception& ex)
+    {
+        *error = convertException(ex);
+        return nil;
+    }
 }
 
 -(void) registerDefaultServant:(id<ICEBlobjectFacade>)facade