From a7def678812e94d8867dcc140f454e3e9dffeacf Mon Sep 17 00:00:00 2001
From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Wed, 7 Feb 2024 12:36:30 +0100
Subject: [PATCH] Fix for removal of orphaned node

---
 matter_server/server/device_controller.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/matter_server/server/device_controller.py b/matter_server/server/device_controller.py
index 643a1e0d..662c8c8a 100644
--- a/matter_server/server/device_controller.py
+++ b/matter_server/server/device_controller.py
@@ -642,7 +642,9 @@ async def remove_node(self, node_id: int) -> None:
             0,
             Clusters.OperationalCredentials.Attributes.CurrentFabricIndex,
         )
-        fabric_index = node.attributes[attribute_path]
+        fabric_index = node.attributes.get(attribute_path)
+        if fabric_index is None:
+            return
         result: Clusters.OperationalCredentials.Commands.NOCResponse | None = None
         try:
             result = await self.chip_controller.SendCommand(