diff --git a/exec/exec.go b/exec/exec.go
index ae875a0..9f2b36a 100644
--- a/exec/exec.go
+++ b/exec/exec.go
@@ -86,7 +86,7 @@ func (c *Cmd) Run() error {
 	c.logDebug("executing command")
 
 	if err := c.cmd.Run(); err != nil {
-		wrapped := wrapError(err, c.name, c.args)
+		wrapped := wrapError("Cmd.Run", err, c.name, c.args)
 		c.logError("command failed", wrapped)
 		return wrapped
 	}
@@ -100,7 +100,7 @@ func (c *Cmd) Output() ([]byte, error) {
 
 	out, err := c.cmd.Output()
 	if err != nil {
-		wrapped := wrapError(err, c.name, c.args)
+		wrapped := wrapError("Cmd.Output", err, c.name, c.args)
 		c.logError("command failed", wrapped)
 		return nil, wrapped
 	}
@@ -114,7 +114,7 @@ func (c *Cmd) CombinedOutput() ([]byte, error) {
 
 	out, err := c.cmd.CombinedOutput()
 	if err != nil {
-		wrapped := wrapError(err, c.name, c.args)
+		wrapped := wrapError("Cmd.CombinedOutput", err, c.name, c.args)
 		c.logError("command failed", wrapped)
 		return out, wrapped
 	}
@@ -154,12 +154,12 @@ func RunQuiet(ctx context.Context, name string, args ...string) error {
 	return nil
 }
 
-func wrapError(err error, name string, args []string) error {
+func wrapError(caller string, err error, name string, args []string) error {
 	cmdStr := name + " " + strings.Join(args, " ")
 	if exitErr, ok := err.(*exec.ExitError); ok {
-		return coreerr.E("wrapError", fmt.Sprintf("command %q failed with exit code %d", cmdStr, exitErr.ExitCode()), err)
+		return coreerr.E(caller, fmt.Sprintf("command %q failed with exit code %d", cmdStr, exitErr.ExitCode()), err)
 	}
-	return coreerr.E("wrapError", fmt.Sprintf("failed to execute %q", cmdStr), err)
+	return coreerr.E(caller, fmt.Sprintf("failed to execute %q", cmdStr), err)
 }
 
 func (c *Cmd) getLogger() Logger {
diff --git a/global_test.go b/global_test.go
index eb334fb..5a6a2cd 100644
--- a/global_test.go
+++ b/global_test.go
@@ -61,7 +61,8 @@ func TestGlobal_SetDefault(t *testing.T) {
 		svc, err := framework.ServiceFor[*Service](c, "process")
 		require.NoError(t, err)
 
-		SetDefault(svc)
+		err = SetDefault(svc)
+		require.NoError(t, err)
 		assert.Equal(t, svc, Default())
 	})
 
@@ -88,7 +89,8 @@ func TestGlobal_ConcurrentDefault(t *testing.T) {
 	svc, err := framework.ServiceFor[*Service](c, "process")
 	require.NoError(t, err)
 
-	SetDefault(svc)
+	err = SetDefault(svc)
+	require.NoError(t, err)
 
 	// Concurrent reads of Default()
 	var wg sync.WaitGroup
@@ -132,7 +134,7 @@ func TestGlobal_ConcurrentSetDefault(t *testing.T) {
 		wg.Add(1)
 		go func(s *Service) {
 			defer wg.Done()
-			SetDefault(s)
+			_ = SetDefault(s)
 		}(svc)
 	}
 	wg.Wait()
@@ -168,7 +170,8 @@ func TestGlobal_ConcurrentOperations(t *testing.T) {
 	svc, err := framework.ServiceFor[*Service](c, "process")
 	require.NoError(t, err)
 
-	SetDefault(svc)
+	err = SetDefault(svc)
+	require.NoError(t, err)
 
 	// Concurrent Start, List, Get operations
 	var wg sync.WaitGroup