diff --git a/internal/prompts/promptsets.go b/internal/prompts/promptsets.go
index 14b14083c1..aee131ffe7 100644
--- a/internal/prompts/promptsets.go
+++ b/internal/prompts/promptsets.go
@@ -46,7 +46,7 @@ func (t PromptsetConfig) Initialize(serverVersion string, promptsMap map[string]
 	var promptset Promptset
 	promptset.Name = t.Name
 	if !tools.IsValidName(promptset.Name) {
-		return promptset, fmt.Errorf("invalid promptset name: %s", t)
+		return promptset, fmt.Errorf("invalid promptset name: %s", promptset.Name)
 	}
 	promptset.Prompts = make([]*Prompt, 0, len(t.PromptNames))
 	promptset.McpManifest = make([]McpManifest, 0, len(t.PromptNames))
@@ -57,7 +57,7 @@ func (t PromptsetConfig) Initialize(serverVersion string, promptsMap map[string]
 	for _, promptName := range t.PromptNames {
 		prompt, ok := promptsMap[promptName]
 		if !ok {
-			return promptset, fmt.Errorf("prompt does not exist: %s", t)
+			return promptset, fmt.Errorf("prompt does not exist: %s", promptName)
 		}
 		promptset.Prompts = append(promptset.Prompts, &prompt)
 		promptset.Manifest.PromptsManifest[promptName] = prompt.Manifest()
diff --git a/internal/tools/toolsets.go b/internal/tools/toolsets.go
index 895e5989b4..b429ef5b19 100644
--- a/internal/tools/toolsets.go
+++ b/internal/tools/toolsets.go
@@ -46,9 +46,9 @@ func (t ToolsetConfig) Initialize(serverVersion string, toolsMap map[string]Tool
 	var toolset Toolset
 	toolset.Name = t.Name
 	if !IsValidName(toolset.Name) {
-		return toolset, fmt.Errorf("invalid toolset name: %s", t)
+		return toolset, fmt.Errorf("invalid toolset name: %s", toolset.Name)
 	}
-	toolset.Tools = make([]*Tool, len(t.ToolNames))
+	toolset.Tools = make([]*Tool, 0, len(t.ToolNames))
 	toolset.Manifest = ToolsetManifest{
 		ServerVersion: serverVersion,
 		ToolsManifest: make(map[string]Manifest),
@@ -56,7 +56,7 @@ func (t ToolsetConfig) Initialize(serverVersion string, toolsMap map[string]Tool
 	for _, toolName := range t.ToolNames {
 		tool, ok := toolsMap[toolName]
 		if !ok {
-			return toolset, fmt.Errorf("tool does not exist: %s", t)
+			return toolset, fmt.Errorf("tool does not exist: %s", toolName)
 		}
 		toolset.Tools = append(toolset.Tools, &tool)
 		toolset.Manifest.ToolsManifest[toolName] = tool.Manifest()