diff --git a/go/pkg/mcp/mcp.go b/go/pkg/mcp/mcp.go
index 963485a..5f97b9f 100644
--- a/go/pkg/mcp/mcp.go
+++ b/go/pkg/mcp/mcp.go
@@ -13,7 +13,6 @@ import (
 	"sync"
 
 	core "dappco.re/go"
-	corelog "dappco.re/go/log"
 	"dappco.re/go/process"
 	"dappco.re/go/ws"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
@@ -32,7 +31,7 @@ type Service struct {
 	workspaceRoot  string           // Root directory for file operations (empty = cwd unless Unrestricted)
 	medium         *coreMedium      // Filesystem medium for sandboxed operations
 	subsystems     []Subsystem      // Additional subsystems registered via Options.Subsystems
-	logger         *corelog.Logger  // Logger for tool execution auditing
+	logger         *core.Log        // Logger for tool execution auditing
 	processService *process.Service // Process management service (optional)
 	wsHub          *ws.Hub          // WebSocket hub for real-time streaming (optional)
 	wsServer       *http.Server     // WebSocket HTTP server (optional)
@@ -83,7 +82,7 @@ func New(opts Options) (
 		server:         server,
 		processService: opts.ProcessService,
 		wsHub:          opts.WSHub,
-		logger:         corelog.Default(),
+		logger:         core.Default(),
 		processMeta:    make(map[string]processRuntime),
 	}
 
diff --git a/go/pkg/mcp/register.go b/go/pkg/mcp/register.go
index e4e975c..f4bc4c4 100644
--- a/go/pkg/mcp/register.go
+++ b/go/pkg/mcp/register.go
@@ -30,7 +30,7 @@ func Register(c *core.Core) core.Result {
 	for _, name := range c.Services() {
 		r := c.Service(name)
 		if !r.OK {
-			continue
+			return r
 		}
 		if sub, ok := r.Value.(Subsystem); ok {
 			subsystems = append(subsystems, sub)
@@ -73,7 +73,7 @@ func (s *Service) OnStartup(ctx context.Context) core.Result {
 		return core.Ok(nil)
 	}
 
-	c.Command("mcp", core.Command{
+	if r := c.Command("mcp", core.Command{
 		Description: "Start the MCP server on stdio",
 		Action: func(opts core.Options) core.Result {
 			s.logger.Info("MCP stdio server starting")
@@ -82,9 +82,11 @@ func (s *Service) OnStartup(ctx context.Context) core.Result {
 			}
 			return core.Ok(nil)
 		},
-	})
+	}); !r.OK {
+		return r
+	}
 
-	c.Command("serve", core.Command{
+	if r := c.Command("serve", core.Command{
 		Description: "Start the MCP server with auto-selected transport",
 		Action: func(opts core.Options) core.Result {
 			s.logger.Info("MCP server starting")
@@ -93,7 +95,9 @@ func (s *Service) OnStartup(ctx context.Context) core.Result {
 			}
 			return core.Ok(nil)
 		},
-	})
+	}); !r.OK {
+		return r
+	}
 
 	return core.Ok(nil)
 }