diff --git a/src/topupopt/problems/esipp/network.py b/src/topupopt/problems/esipp/network.py
index 91dbf5c0f01b439677c10f96d776f7c0cbe4e3ce..be2f17a9fb35dd1bf56048151bb98303b348f6a3 100644
--- a/src/topupopt/problems/esipp/network.py
+++ b/src/topupopt/problems/esipp/network.py
@@ -752,9 +752,12 @@ class Network(nx.MultiDiGraph):
         elif self.is_source_sink_node(node_key):
             # source/sink node
             self.source_sink_nodes.remove(node_key)
-        else: # self.is_waypoint_node(node_key):
+        elif self.is_waypoint_node(node_key):
             # has to be a waypoint node
             self.waypoint_nodes.remove(node_key)
+        # No need to reset node but this could mean something is up
+        # else:
+        #     raise ValueError('Unknown node type.')
 
     # *************************************************************************
     # *************************************************************************
diff --git a/tests/test_dhn_utils.py b/tests/test_dhn_utils.py
index 0ad992e353b0a7469b53ec2dfa7a87a2b95fb9a4..e5be17ccb79d37080013a511c977696a2181e8ab 100644
--- a/tests/test_dhn_utils.py
+++ b/tests/test_dhn_utils.py
@@ -20,7 +20,6 @@ from topupheat.common.fluids import FluidDatabase  # , Fluid
 # *****************************************************************************
 # *****************************************************************************
 
-
 class TestDistrictHeatingNetworkUtils:
     # *************************************************************************
     # *************************************************************************