diff --git a/include/ccapi_cpp/service/ccapi_fix_service.h b/include/ccapi_cpp/service/ccapi_fix_service.h
index 70f40af5..337b00d6 100644
--- a/include/ccapi_cpp/service/ccapi_fix_service.h
+++ b/include/ccapi_cpp/service/ccapi_fix_service.h
@@ -170,7 +170,7 @@ class FixService : public Service {
           if constexpr (std::is_same_v<StreamType, beast::ssl_stream<beast::tcp_stream>>) {
             if (!SSL_set_tlsext_host_name(streamPtr->native_handle(), fixConnectionPtr->host.c_str())) {
               beast::error_code ec{static_cast<int>(::ERR_get_error()), net::error::get_ssl_category()};
-              CCAPI_LOGGER_DEBUG("error SSL_set_tlsext_host_name: " + ec.message());
+              CCAPI_LOGGER_DEBUG("error SSL_set_tlsext_host_name for host " + fixConnectionPtr->host + ": " + ec.message());
               this->onError(Event::Type::FIX_STATUS, Message::Type::FIX_FAILURE, ec, "set SNI Hostname", {fixConnectionPtr->subscription.getCorrelationId()});
               return;
             }
diff --git a/include/ccapi_cpp/service/ccapi_service.h b/include/ccapi_cpp/service/ccapi_service.h
index 36f23411..c2373448 100644
--- a/include/ccapi_cpp/service/ccapi_service.h
+++ b/include/ccapi_cpp/service/ccapi_service.h
@@ -533,7 +533,7 @@ class Service : public std::enable_shared_from_this<Service> {
     // Set SNI hostname (important for TLS handshakes)
     if (!SSL_set_tlsext_host_name(streamPtr->native_handle(), host.c_str())) {
       beast::error_code ec{static_cast<int>(::ERR_get_error()), net::error::get_ssl_category()};
-      CCAPI_LOGGER_DEBUG("error SSL_set_tlsext_host_name: " + ec.message());
+      CCAPI_LOGGER_DEBUG("error SSL_set_tlsext_host_name for host " + host + ": " + ec.message());
       throw ec;
     }
 
@@ -1024,7 +1024,7 @@ class Service : public std::enable_shared_from_this<Service> {
             // Set SNI hostname (only for WSS)
             if (!SSL_set_tlsext_host_name(streamPtr->next_layer().native_handle(), wsConnectionPtr->host.c_str())) {
               beast::error_code ec{static_cast<int>(::ERR_get_error()), net::error::get_ssl_category()};
-              CCAPI_LOGGER_DEBUG("error SSL_set_tlsext_host_name: " + ec.message());
+              CCAPI_LOGGER_DEBUG("error SSL_set_tlsext_host_name for host " + wsConnectionPtr->host + ": " + ec.message());
               this->onError(Event::Type::SUBSCRIPTION_STATUS, Message::Type::SUBSCRIPTION_FAILURE, ec, "set SNI Hostname", wsConnectionPtr->correlationIdList);
               return;
             }