diff --git a/hscontrol/state/debug.go b/hscontrol/state/debug.go
index 9cad1c04..abb34eb0 100644
--- a/hscontrol/state/debug.go
+++ b/hscontrol/state/debug.go
@@ -245,7 +245,7 @@ func (s *State) DebugPolicy() (string, error) {
 
 		return string(pol), nil
 	default:
-		return "", fmt.Errorf("unsupported policy mode: %s", s.cfg.Policy.Mode)
+		return "", fmt.Errorf("%w: %s", ErrUnsupportedPolicyMode, s.cfg.Policy.Mode)
 	}
 }
 
diff --git a/hscontrol/state/state.go b/hscontrol/state/state.go
index 1004151e..bb929faa 100644
--- a/hscontrol/state/state.go
+++ b/hscontrol/state/state.go
@@ -500,7 +500,7 @@ func (s *State) Disconnect(id types.NodeID) ([]change.Change, error) {
 	})
 
 	if !ok {
-		return nil, fmt.Errorf("node not found: %d", id)
+		return nil, fmt.Errorf("%w: %d", ErrNodeNotFound, id)
 	}
 
 	log.Info().Uint64("node.id", id.Uint64()).Str("node.name", node.Hostname()).Msg("Node disconnected")