1 files changed, 7 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/messaging/amqp/ConnectionHandle.cpp b/qpid/cpp/src/qpid/messaging/amqp/ConnectionHandle.cpp
index c1ab108a61..90227fa29b 100644
--- a/qpid/cpp/src/qpid/messaging/amqp/ConnectionHandle.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/ConnectionHandle.cpp
@@ -31,7 +31,13 @@ namespace amqp {
 namespace {
 ConnectionImpl* create(const std::string& u, const qpid::types::Variant::Map& o)
 {
-    return new ConnectionHandle(u, o);
+    try {
+        return new ConnectionHandle(u, o);
+    } catch (const types::Exception& ) {
+        throw;
+    } catch (const qpid::Exception& e) {
+        throw messaging::ConnectionError( e.what() );
+    }
 }
 
 struct StaticInit