diff --git a/sdks/python/apache_beam/yaml/generate_yaml_docs.py b/sdks/python/apache_beam/yaml/generate_yaml_docs.py
index 84a5e62f0abd..4088e17afe2c 100644
--- a/sdks/python/apache_beam/yaml/generate_yaml_docs.py
+++ b/sdks/python/apache_beam/yaml/generate_yaml_docs.py
@@ -20,13 +20,17 @@
 import itertools
 import re
 
+import docstring_parser
 import yaml
 
 from apache_beam.portability.api import schema_pb2
+from apache_beam.typehints import schemas
 from apache_beam.utils import subprocess_server
+from apache_beam.utils.python_callable import PythonCallableWithSource
 from apache_beam.version import __version__ as beam_version
 from apache_beam.yaml import json_utils
 from apache_beam.yaml import yaml_provider
+from apache_beam.yaml.yaml_mapping import ErrorHandlingConfig
 
 
 def _singular(name):
@@ -135,8 +139,28 @@ def maybe_row_parameters(t):
   def maybe_optional(t):
     return " (Optional)" if t.nullable else ""
 
+  def normalize_error_handling(f):
+    doc = docstring_parser.parse(
+        ErrorHandlingConfig.__doc__, docstring_parser.DocstringStyle.GOOGLE)
+    if f.name == "error_handling":
+      f = schema_pb2.Field(
+          name="error_handling",
+          type=schema_pb2.FieldType(
+              row_type=schema_pb2.RowType(
+                  schema=schema_pb2.Schema(
+                      fields=[
+                          schemas.schema_field(
+                              param.arg_name,
+                              PythonCallableWithSource.load_from_expression(
+                                  param.type_name),
+                              param.description) for param in doc.params
+                      ]))),
+          description=f.description)
+    return f
+
   def lines():
     for f in schema.fields:
+      f = normalize_error_handling(f)
       yield ''.join([
           f'**{f.name}** `{pretty_type(f.type)}`',
           maybe_optional(f.type),
diff --git a/sdks/python/apache_beam/yaml/yaml_mapping.py b/sdks/python/apache_beam/yaml/yaml_mapping.py
index 960fcdeecf30..5c14b0f5ea79 100644
--- a/sdks/python/apache_beam/yaml/yaml_mapping.py
+++ b/sdks/python/apache_beam/yaml/yaml_mapping.py
@@ -418,6 +418,11 @@ def checking_func(row):
 
 
 class ErrorHandlingConfig(NamedTuple):
+  """Class to define Error Handling parameters.
+
+      Args:
+        output (str): Name to use for the output error collection
+      """
   output: str
   # TODO: Other parameters are valid here too, but not common to Java.