diff --git a/capellambse_context_diagrams/collectors/default.py b/capellambse_context_diagrams/collectors/default.py
index 91d5c6ac..5f320c6e 100644
--- a/capellambse_context_diagrams/collectors/default.py
+++ b/capellambse_context_diagrams/collectors/default.py
@@ -176,13 +176,10 @@ def _process_ports(self, stack_heights: dict[str, float | int]) -> None:
                 while (
                     current
                     and current.uuid not in self.diagram_target_owners
-                    and hasattr(current, "owner")
+                    and getattr(current, "owner", None) is not None
                     and not isinstance(current.owner, generic.PackageTypes)
                 ):
-                    current = self._make_owner_box(
-                        self.diagram,
-                        current,
-                    )
+                    current = self._make_owner_box(self.diagram, current)
                 self.common_owners.add(current.uuid)
 
             stack_heights[side] += makers.NEIGHBOR_VMARGIN + height