diff --git a/internal/cmd/commands/authmethodscmd/oidc_funcs.go b/internal/cmd/commands/authmethodscmd/oidc_funcs.go
index e998188b0..4119e6dc1 100644
--- a/internal/cmd/commands/authmethodscmd/oidc_funcs.go
+++ b/internal/cmd/commands/authmethodscmd/oidc_funcs.go
@@ -291,7 +291,10 @@ func executeExtraOidcActionsImpl(c *OidcCommand, origResp *api.Response, origIte
 			opts = append(opts, authmethods.WithOidcAuthMethodDisableDiscoveredConfigValidation(true))
 		}
 		result, err := amClient.ChangeState(c.Context, c.FlagId, version, c.flagState, opts...)
-		return result.GetResponse(), result.GetItem(), err
+		if err != nil {
+			return nil, nil, err
+		}
+		return result.GetResponse(), result.GetItem(), nil
 	}
 	return origResp, origItem, origError
 }
diff --git a/internal/cmd/commands/workerscmd/worker-led_funcs.go b/internal/cmd/commands/workerscmd/worker-led_funcs.go
index 13a1cffba..b8d92a996 100644
--- a/internal/cmd/commands/workerscmd/worker-led_funcs.go
+++ b/internal/cmd/commands/workerscmd/worker-led_funcs.go
@@ -58,7 +58,10 @@ func executeExtraWorkerLedActionsImpl(c *WorkerLedCommand, origResp *api.Respons
 	switch c.Func {
 	case "create":
 		result, err := workerClient.CreateWorkerLed(c.Context, c.flagWorkerGeneratedAuthToken, c.FlagScopeId, opts...)
-		return result.GetResponse(), result.GetItem(), err
+		if err != nil {
+			return nil, nil, err
+		}
+		return result.GetResponse(), result.GetItem(), nil
 	}
 	return origResp, origItem, origError
 }