diff --git a/silkaj/network_tools.py b/silkaj/network_tools.py
index 89701d5edeeea5638ac12f1eb838cf85870cc4eb..6e91e94282d4df2bfae567f443d9964a5440bf1c 100644
--- a/silkaj/network_tools.py
+++ b/silkaj/network_tools.py
@@ -134,9 +134,7 @@ class EndPoint(object):
             ctx = get_current_context()
             peer = ctx.obj["PEER"]
             gtest = ctx.obj["GTEST"]
-        # To be activated when dropping Python 3.5
-        # except (ModuleNotFoundError, RuntimeError):
-        except:
+        except (ModuleNotFoundError, RuntimeError):
             peer, gtest = None, None
         if peer:
             if ":" in peer: