diff --git a/backend/src/services/ScriptExecutor.ts b/backend/src/services/ScriptExecutor.ts
index e41ea72..c4a1920 100644
--- a/backend/src/services/ScriptExecutor.ts
+++ b/backend/src/services/ScriptExecutor.ts
@@ -39,7 +39,7 @@ export class ScriptExecutor {
         const dbId = (query as any).database_id || context.databaseId;
 
         if (!dbId) {
-          throw new Error(`Database ID not found. Query database_id: ${(query as any).database_id}, Context databaseId: ${context.databaseId}. Please specify database_id in the query configuration.`);
+          throw new Error(`Database ID not found for query '${queryName}'. Query database_id: ${(query as any).database_id}, Context databaseId: ${context.databaseId}. Please specify database_id in the Script Queries configuration for query '${queryName}'.`);
         }
 
         const result = await sqlExecutor.executeQuery(dbId, processedQuery, paramValues);
@@ -168,7 +168,7 @@ print(json.dumps(result))
 
             if (!dbId) {
               python.stdin.write(JSON.stringify({
-                error: `Database ID not found. Query database_id: ${(query as any).database_id}, Context databaseId: ${context.databaseId}. Please specify database_id in the query configuration.`
+                error: `Database ID not found for query '${request.query_name}'. Query database_id: ${(query as any).database_id}, Context databaseId: ${context.databaseId}. Please specify database_id in the Script Queries configuration for query '${request.query_name}'.`
               }) + '\n');
               continue;
             }