diff --git a/toolbox/enrichment/src/agent/tools.ts b/toolbox/enrichment/src/agent/tools.ts
index 2cdd159..94f1339 100644
--- a/toolbox/enrichment/src/agent/tools.ts
+++ b/toolbox/enrichment/src/agent/tools.ts
@@ -15,12 +15,12 @@ function expandEnvVars(str: string): string {
 
 export async function loadMcpTools(configPath: string): Promise<adk.MCPToolset[]> {
   const mcpConfigPath = path.join(configPath, 'mcp.json');
-  const stat = await fs.promises.stat(mcpConfigPath);
-  if (!stat.isFile()) {
-    return [];
-  }
 
   try {
+    const stat = await fs.promises.stat(mcpConfigPath);
+    if (!stat.isFile()) {
+      return [];
+    }
     const content = await fs.promises.readFile(mcpConfigPath, 'utf-8');
     const config = JSON.parse(content);
     const toolsets: adk.MCPToolset[] = [];
@@ -61,19 +61,22 @@ export async function loadMcpTools(configPath: string): Promise<adk.MCPToolset[]
     return toolsets;
   }
   catch (error: any) {
-    console.warn(`Warning: Failed to load mcp.json: ${error.message}`);
+    if (error?.code !== 'ENOENT') {
+      // ENOENT simply means the optional mcp.json isn't present.
+      console.warn(`Warning: Failed to load mcp.json: ${error.message}`);
+    }
     return [];
   }
 }
 
 export async function loadSkills(configPath: string): Promise<adk.SkillToolset[]> {
   const skillsBasePath = path.join(configPath, 'skills');
-  const stat = await fs.promises.stat(skillsBasePath);
-  if (!stat.isDirectory()) {
-    return [];
-  }
 
   try {
+    const stat = await fs.promises.stat(skillsBasePath);
+    if (!stat.isDirectory()) {
+      return [];
+    }
     const skillsMap = await adk.loadAllSkillsInDir(skillsBasePath);
     if (Object.keys(skillsMap).length === 0) {
       return [];
@@ -86,7 +89,10 @@ export async function loadSkills(configPath: string): Promise<adk.SkillToolset[]
     ];
   }
   catch (error: any) {
-    console.warn(`Warning: Failed to load skills: ${error.message}`);
+    if (error?.code !== 'ENOENT') {
+      // ENOENT simply means the optional skills/ directory isn't present.
+      console.warn(`Warning: Failed to load skills: ${error.message}`);
+    }
     return [];
   }
 }