diff --git a/src/Model/BoundaryCondition/BoundaryConditionList.py b/src/Model/BoundaryCondition/BoundaryConditionList.py
index b2c7b8bc9a8e784cc26c7fcb82649fb3ac82d352..2ff27885407d722dc9b853d8190ad14cc5148231 100644
--- a/src/Model/BoundaryCondition/BoundaryConditionList.py
+++ b/src/Model/BoundaryCondition/BoundaryConditionList.py
@@ -91,9 +91,14 @@ class BoundaryConditionList(PamhyrModelListWithTab):
         return copy(self)
 
     def get_assoc_to_node(self, tab, node):
-        return next(
+        assoc = list(
             filter(
                 lambda i: i.node is node,
                 self._tabs[tab]
             )
         )
+
+        if len(assoc) > 0:
+            return assoc[0]
+
+        return None