diff --git a/src/common/xmpp/tls_nb.py b/src/common/xmpp/tls_nb.py
index 4cf2a5c2118d9df9d855b20fd017d20000ed1029..d6797e2496f2ca620c044d92a0d4232085613217 100644
--- a/src/common/xmpp/tls_nb.py
+++ b/src/common/xmpp/tls_nb.py
@@ -355,10 +355,9 @@ class NonBlockingTLS(PlugIn):
             # If we are going to use a client cert/key pair for authentication,
             # we choose TLSv1 method.
             tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.TLSv1_METHOD)
-            client_cert_path = self._owner._owner._caller.client_cert
             log.debug('Using client cert and key from %s' % conn.client_cert)
             try:
-                p12 = OpenSSL.crypto.load_pkcs12(open(client_cert_path).read())
+                p12 = OpenSSL.crypto.load_pkcs12(open(conn.client_cert).read())
             except OpenSSL.crypto.Error, exception_obj:
                 log.warning('Unable to load client pkcs12 certificate from '
                     'file %s: %s ... Is it a valid PKCS12 cert?' % \