diff --git a/docs/components/connectors/out-of-the-box-connectors/agentic-ai-aiagent-subprocess.md b/docs/components/connectors/out-of-the-box-connectors/agentic-ai-aiagent-subprocess.md
index 21d1498b8c6..ca8408974c5 100644
--- a/docs/components/connectors/out-of-the-box-connectors/agentic-ai-aiagent-subprocess.md
+++ b/docs/components/connectors/out-of-the-box-connectors/agentic-ai-aiagent-subprocess.md
@@ -57,6 +57,6 @@ See [event handling](#configuration-event-handling) for more information.
-
+
diff --git a/docs/components/connectors/out-of-the-box-connectors/agentic-ai-aiagent-task.md b/docs/components/connectors/out-of-the-box-connectors/agentic-ai-aiagent-task.md
index a00cacaf9f4..3efdb3e69bb 100644
--- a/docs/components/connectors/out-of-the-box-connectors/agentic-ai-aiagent-task.md
+++ b/docs/components/connectors/out-of-the-box-connectors/agentic-ai-aiagent-task.md
@@ -41,7 +41,7 @@ Implement an AI agent using an AI Agent connector applied to a service task, pai
-
+
diff --git a/docs/components/connectors/out-of-the-box-connectors/agentic-ai/aiagent/configuration/_error-codes-task.md b/docs/components/connectors/out-of-the-box-connectors/agentic-ai/aiagent/configuration/_error-codes-task.md
new file mode 100644
index 00000000000..8e74f8c3adb
--- /dev/null
+++ b/docs/components/connectors/out-of-the-box-connectors/agentic-ai/aiagent/configuration/_error-codes-task.md
@@ -0,0 +1,7 @@
+The AI Agent Task generates the following error codes when creating the tool schema from the process definition XML:
+
+| Error code | Description |
+| :----------------------------------- | :------------------------------------------------------------------------------------------------------- |
+| `AD_HOC_SUB_PROCESS_XML_FETCH_ERROR` | The process definition XML could not be fetched. |
+| `AD_HOC_SUB_PROCESS_NOT_FOUND` | The ad-hoc sub-process with the configured ID could not be found in the process definition XML. |
+| `AD_HOC_TOOL_DEFINITION_INVALID` | The ad-hoc sub-process contains invalid tool definitions which can't be transformed into a tool schema. |
diff --git a/docs/components/connectors/out-of-the-box-connectors/agentic-ai/aiagent/configuration/_error-handling.md b/docs/components/connectors/out-of-the-box-connectors/agentic-ai/aiagent/configuration/_error-handling.md
index aa907568a6c..f25e7c50fd3 100644
--- a/docs/components/connectors/out-of-the-box-connectors/agentic-ai/aiagent/configuration/_error-handling.md
+++ b/docs/components/connectors/out-of-the-box-connectors/agentic-ai/aiagent/configuration/_error-handling.md
@@ -1,3 +1,5 @@
+import ConfigurationErrorCodesTask from './\_error-codes-task.md';
+
### Error handling
If an error occurs, the AI Agent connector throws an error and includes the error response in the error variable in Operate.
@@ -5,3 +7,16 @@ If an error occurs, the AI Agent connector throws an error and includes the erro
| Field | Required | Description |
| :--------------- | :------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| Error expression | No | You can handle an AI Agent connector error using an Error Boundary Event and [error expressions](/components/connectors/use-connectors/index.md#error-expression). |
+
+In the error expression, you can handle the following error codes emitted by the AI Agent connector to respond to specific situations. For example, you can map a specific error code to a BPMN error and model
+your process accordingly.
+
+| Error code | Description |
+| :-------------------------------------- | :--------------------------------------------------------------------------------------------------------------------------------------------- |
+| `FAILED_MODEL_CALL` | The call to the LLM API failed, for example due to misconfiguration or wrong credentials. The error message contains additional details. |
+| `FAILED_TO_PARSE_RESPONSE_CONTENT` | The AI Agent was configured to parse the LLM response as JSON, but the parsing failed. |
+| `MAXIMUM_NUMBER_OF_MODEL_CALLS_REACHED` | The AI Agent reached the maximum number of configured model calls. |
+| `NO_USER_MESSAGE_CONTENT` | Indicates that no user message content, either from a user prompt or a document, was provided to the agent. |
+| `TOOL_CALL_RESULTS_ON_EMPTY_CONTEXT` | Tool call results were passed to the AI Agent despite the context being empty, which typically indicates a misconfiguration of the agent context. |
+
+{props.type === "task" && }
diff --git a/versioned_docs/version-8.8/components/connectors/out-of-the-box-connectors/agentic-ai-aiagent-subprocess.md b/versioned_docs/version-8.8/components/connectors/out-of-the-box-connectors/agentic-ai-aiagent-subprocess.md
index 21d1498b8c6..ca8408974c5 100644
--- a/versioned_docs/version-8.8/components/connectors/out-of-the-box-connectors/agentic-ai-aiagent-subprocess.md
+++ b/versioned_docs/version-8.8/components/connectors/out-of-the-box-connectors/agentic-ai-aiagent-subprocess.md
@@ -57,6 +57,6 @@ See [event handling](#configuration-event-handling) for more information.
-
+
diff --git a/versioned_docs/version-8.8/components/connectors/out-of-the-box-connectors/agentic-ai-aiagent-task.md b/versioned_docs/version-8.8/components/connectors/out-of-the-box-connectors/agentic-ai-aiagent-task.md
index a00cacaf9f4..3efdb3e69bb 100644
--- a/versioned_docs/version-8.8/components/connectors/out-of-the-box-connectors/agentic-ai-aiagent-task.md
+++ b/versioned_docs/version-8.8/components/connectors/out-of-the-box-connectors/agentic-ai-aiagent-task.md
@@ -41,7 +41,7 @@ Implement an AI agent using an AI Agent connector applied to a service task, pai
-
+
diff --git a/versioned_docs/version-8.8/components/connectors/out-of-the-box-connectors/agentic-ai/aiagent/configuration/_error-codes-task.md b/versioned_docs/version-8.8/components/connectors/out-of-the-box-connectors/agentic-ai/aiagent/configuration/_error-codes-task.md
new file mode 100644
index 00000000000..8e74f8c3adb
--- /dev/null
+++ b/versioned_docs/version-8.8/components/connectors/out-of-the-box-connectors/agentic-ai/aiagent/configuration/_error-codes-task.md
@@ -0,0 +1,7 @@
+The AI Agent Task generates the following error codes when creating the tool schema from the process definition XML:
+
+| Error code | Description |
+| :----------------------------------- | :------------------------------------------------------------------------------------------------------- |
+| `AD_HOC_SUB_PROCESS_XML_FETCH_ERROR` | The process definition XML could not be fetched. |
+| `AD_HOC_SUB_PROCESS_NOT_FOUND` | The ad-hoc sub-process with the configured ID could not be found in the process definition XML. |
+| `AD_HOC_TOOL_DEFINITION_INVALID` | The ad-hoc sub-process contains invalid tool definitions which can't be transformed into a tool schema. |
diff --git a/versioned_docs/version-8.8/components/connectors/out-of-the-box-connectors/agentic-ai/aiagent/configuration/_error-handling.md b/versioned_docs/version-8.8/components/connectors/out-of-the-box-connectors/agentic-ai/aiagent/configuration/_error-handling.md
index aa907568a6c..a918bf4390c 100644
--- a/versioned_docs/version-8.8/components/connectors/out-of-the-box-connectors/agentic-ai/aiagent/configuration/_error-handling.md
+++ b/versioned_docs/version-8.8/components/connectors/out-of-the-box-connectors/agentic-ai/aiagent/configuration/_error-handling.md
@@ -1,3 +1,5 @@
+import ConfigurationErrorCodesTask from './\_error-codes-task.md';
+
### Error handling
If an error occurs, the AI Agent connector throws an error and includes the error response in the error variable in Operate.
@@ -5,3 +7,15 @@ If an error occurs, the AI Agent connector throws an error and includes the erro
| Field | Required | Description |
| :--------------- | :------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| Error expression | No | You can handle an AI Agent connector error using an Error Boundary Event and [error expressions](/components/connectors/use-connectors/index.md#error-expression). |
+
+In the error expression, you can handle the following error codes emitted by the AI Agent connector to respond to specific situations. For example, you can map a specific error code to a BPMN error and model
+your process accordingly.
+
+| Error code | Description |
+| :-------------------------------------- | :--------------------------------------------------------------------------------------------------------------------------------------------- |
+| `FAILED_TO_PARSE_RESPONSE_CONTENT` | The AI Agent was configured to parse the LLM response as JSON, but the parsing failed. |
+| `MAXIMUM_NUMBER_OF_MODEL_CALLS_REACHED` | The AI Agent reached the maximum number of configured model calls. |
+| `NO_USER_MESSAGE_CONTENT` | Indicates that no user message content, either from a user prompt or a document, was provided to the agent. |
+| `TOOL_CALL_RESULTS_ON_EMPTY_CONTEXT` | Tool call results were passed to the AI Agent despite the context being empty, which typically indicates a misconfiguration of the agent context. |
+
+{props.type === "task" && }