diff --git a/tests/system_tests_tcp_adaptor.py b/tests/system_tests_tcp_adaptor.py
index b36fa791f..b6cf6173d 100644
--- a/tests/system_tests_tcp_adaptor.py
+++ b/tests/system_tests_tcp_adaptor.py
@@ -156,29 +156,23 @@ def __init__(self, test_name, client_n, logger, client, server, size,
                         'CLIENT_PRIVATE_KEY_PASSWORD': CLIENT_PRIVATE_KEY_PASSWORD,
                         'CA_CERT': CA_CERT}
 
-        try:
-            self.e_client = TcpEchoClient(prefix=self.client_prefix,
-                                          host='localhost',
-                                          port=self.listener_port,
-                                          size=self.size,
-                                          count=self.count,
-                                          timeout=self.timeout,
-                                          logger=self.client_logger,
-                                          ssl_info=ssl_info,
-                                          delay_close=delay_close)
-
-        except Exception as exc:
-            self.e_client.error = "TCP_TEST TcpAdaptor_runner_%s failed. Exception: %s" % \
-                                  (self.name, traceback.format_exc())
-            self.logger.log(self.e_client.error)
-            raise Exception(self.e_client.error)
+        self.e_client = TcpEchoClient(prefix=self.client_prefix,
+                                      host='localhost',
+                                      port=self.listener_port,
+                                      size=self.size,
+                                      count=self.count,
+                                      timeout=self.timeout,
+                                      logger=self.client_logger,
+                                      ssl_info=ssl_info,
+                                      delay_close=delay_close)
 
     def wait(self):
         """
         Block until the client completes. An exception is raised if the client
         failed.
         """
-        self.e_client.wait()
+        if self.e_client is not None:
+            self.e_client.wait()
 
 
 class TcpAdaptorBase(TestCase):