1 files changed, 2 insertions, 1 deletions
diff --git a/qpid/cpp/examples/messaging/client.cpp b/qpid/cpp/examples/messaging/client.cpp
index 4d68d7c575..3f7afb5e3e 100644
--- a/qpid/cpp/examples/messaging/client.cpp
+++ b/qpid/cpp/examples/messaging/client.cpp
@@ -39,8 +39,8 @@ using std::string;
 int main(int argc, char** argv) {
     const char* url = argc>1 ? argv[1] : "amqp:tcp:127.0.0.1:5672";
 
+    Connection connection;
     try {
-        Connection connection;
         connection.open(url);
         Session session = connection.newSession();
 
@@ -70,6 +70,7 @@ int main(int argc, char** argv) {
         return 0;
     } catch(const std::exception& error) {
         std::cout << error.what() << std::endl;
+        connection.close();
     }
     return 1;
 }