diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/Agent.node.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/Agent.node.ts
index acbdf28cf486d..e4843f356cc0c 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/Agent.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/Agent.node.ts
@@ -190,7 +190,14 @@ const agentTypeProperty: INodeProperties = {
 	name: 'agent',
 	type: 'options',
 	noDataExpression: true,
+	// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
 	options: [
+		{
+			name: 'Tools Agent',
+			value: 'toolsAgent',
+			description:
+				'Utilized unified Tool calling interface to select the appropriate tools and argument for execution',
+		},
 		{
 			name: 'Conversational Agent',
 			value: 'conversationalAgent',
@@ -219,12 +226,6 @@ const agentTypeProperty: INodeProperties = {
 			value: 'sqlAgent',
 			description: 'Answers questions about data in an SQL database',
 		},
-		{
-			name: 'Tools Agent',
-			value: 'toolsAgent',
-			description:
-				'Utilized unified Tool calling interface to select the appropriate tools and argument for execution',
-		},
 	],
 	default: '',
 };
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/execute.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/execute.ts
index 11cc3a4de2047..603f5afb666b5 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/execute.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/execute.ts
@@ -155,11 +155,19 @@ export async function toolsAgentExecute(this: IExecuteFunctions): Promise<INodeE
 				throw new NodeOperationError(this.getNode(), 'The ‘text parameter is empty.');
 			}
 
+			// OpenAI doesn't allow empty tools array so we will provide a more user-friendly error message
+			if (model.lc_namespace.includes('openai') && tools.length === 0) {
+				throw new NodeOperationError(
+					this.getNode(),
+					"Please connect at least one tool. If you don't need any, try the conversational agent instead",
+				);
+			}
+
 			const response = await executor.invoke({
 				input,
 				system_message: options.systemMessage ?? SYSTEM_MESSAGE,
 				formatting_instructions:
-					'IMPORTANT: Always call `format_final_response` to format your final response!', //outputParser?.getFormatInstructions(),
+					'IMPORTANT: Always call `format_final_response` to format your final response!',
 			});
 
 			returnData.push({
@@ -174,7 +182,10 @@ export async function toolsAgentExecute(this: IExecuteFunctions): Promise<INodeE
 			});
 		} catch (error) {
 			if (this.continueOnFail()) {
-				returnData.push({ json: { error: error.message }, pairedItem: { item: itemIndex } });
+				returnData.push({
+					json: { error: error?.message },
+					pairedItem: { item: itemIndex },
+				});
 				continue;
 			}