1 files changed, 4 insertions, 2 deletions
diff --git a/cpp/src/tests/perftest.cpp b/cpp/src/tests/perftest.cpp
index 6456bc8304..ae07da7f6c 100644
--- a/cpp/src/tests/perftest.cpp
+++ b/cpp/src/tests/perftest.cpp
@@ -238,8 +238,10 @@ struct Client : public Runnable {
 
     ~Client() {
         try {
-            session.close();
-            connection->close();
+            if (connection->isOpen()) {
+                session.close();
+                connection->close();
+            }
         } catch (const std::exception& e) {
             std::cerr << "Error in shutdown: " << e.what() << std::endl;
         }