diff --git a/modules/test/base/python/src/test_module.py b/modules/test/base/python/src/test_module.py
index 54e3c3008..beedaf7bf 100644
--- a/modules/test/base/python/src/test_module.py
+++ b/modules/test/base/python/src/test_module.py
@@ -101,12 +101,10 @@ def run_tests(self):
             else:
               result = getattr(self, test_method_name)()
           except Exception as e:
-            LOGGER.info(f'An error occurred whilst running {test["name"]}')
+            LOGGER.error(f'An error occurred whilst running {test["name"]}')
             LOGGER.error(e)
-            return None
         else:
           LOGGER.info(f'Test {test["name"]} not implemented. Skipping')
-          result = None
       else:
         LOGGER.debug(f'Test {test["name"]} is disabled')
 
diff --git a/modules/test/tls/python/src/tls_util.py b/modules/test/tls/python/src/tls_util.py
index 85ddcc012..3a196d5b8 100644
--- a/modules/test/tls/python/src/tls_util.py
+++ b/modules/test/tls/python/src/tls_util.py
@@ -83,6 +83,9 @@ def get_public_certificate(self,
     except ssl.SSLError as e:
       LOGGER.info(f'SSL error occurred: {e}')
       return None
+    except socket.timeout:
+      LOGGER.info('Socket timeout error')
+      return None
 
     return cert_pem