diff --git a/pkg/engine/cmd.go b/pkg/engine/cmd.go
index 9ef6e834..a4f6d3ed 100644
--- a/pkg/engine/cmd.go
+++ b/pkg/engine/cmd.go
@@ -124,10 +124,10 @@ func (e *Engine) runCommand(ctx Context, tool types.Tool, input string, toolCate
 	}
 	cmd, stop, err := e.newCommand(ctx.Ctx, extraEnv, tool, input, true)
 	if err != nil {
-		if toolCategory == NoCategory {
+		if toolCategory == NoCategory && ctx.Parent != nil {
 			return fmt.Sprintf("ERROR: got (%v) while parsing command", err), nil
 		}
-		return "", err
+		return "", fmt.Errorf("got (%v) while parsing command", err)
 	}
 	defer stop()
 
diff --git a/pkg/sdkserver/workspaces.go b/pkg/sdkserver/workspaces.go
index 87bc4583..0cbf94b2 100644
--- a/pkg/sdkserver/workspaces.go
+++ b/pkg/sdkserver/workspaces.go
@@ -26,7 +26,6 @@ func (w workspaceCommonRequest) getToolRepo() string {
 type createWorkspaceRequest struct {
 	workspaceCommonRequest `json:",inline"`
 	ProviderType           string   `json:"providerType"`
-	DirectoryDataHome      string   `json:"directoryDataHome"`
 	FromWorkspaceIDs       []string `json:"fromWorkspaceIDs"`
 }
 
@@ -53,8 +52,8 @@ func (s *server) createWorkspace(w http.ResponseWriter, r *http.Request) {
 		prg,
 		reqObject.Env,
 		fmt.Sprintf(
-			`{"provider": "%s", "data_home": "%s", "workspace_ids": "%s"}`,
-			reqObject.ProviderType, reqObject.DirectoryDataHome, strings.Join(reqObject.FromWorkspaceIDs, ","),
+			`{"provider": "%s", "workspace_ids": "%s"}`,
+			reqObject.ProviderType, strings.Join(reqObject.FromWorkspaceIDs, ","),
 		),
 	)
 	if err != nil {