Implement more try-excepts

Author: bouwew

plugwise_usb/__init__.py

@@ -14,7 +14,7 @@
 
 from .api import NodeEvent, PlugwiseNode, StickEvent
 from .connection import StickController
-from .exceptions import StickError, SubscriptionError
+from .exceptions import NodeError, StickError, SubscriptionError
 from .network import StickNetwork
 
 FuncT = TypeVar("FuncT", bound=Callable[..., Any])
@@ -350,15 +350,21 @@ async def register_node(self, mac: str) -> bool:
         """Add node to plugwise network."""
         if self._network is None:
             return False
-        return await self._network.register_node(mac)
+        try:
+            return await self._network.register_node(mac)
+        except NodeError as exc:
+            raise NodeError(f"Unable to add Node ({mac}): {exc}") from exc
 
     @raise_not_connected
     @raise_not_initialized
     async def unregister_node(self, mac: str) -> None:
         """Remove node to plugwise network."""
         if self._network is None:
             return
-        await self._network.unregister_node(mac)
+        try:
+            await self._network.unregister_node(mac)
+        except MessageError as exc:
+            raise NodeError(f"Unable to remove Node ({mac}): {exc}") from exc
 
     async def disconnect(self) -> None:
         """Disconnect from USB-Stick."""

plugwise_usb/network/__init__.py

@@ -164,7 +164,7 @@ async def unregister_node(self, mac: str) -> None:
             await self._nodes[mac].unload()
             self._nodes.pop(mac)
         except KeyError as exc:
-            raise MessageError("Mac not registered, already deleted?")
+            raise MessageError("Mac not registered, already deleted?") from exc
 
     # region - Handle stick connect/disconnect events
     def _subscribe_to_protocol_events(self) -> None: