diff --git a/sdks/python/apache_beam/yaml/generate_yaml_docs.py b/sdks/python/apache_beam/yaml/generate_yaml_docs.py
index 2123c7a9f202..e0a9f3f5e6c5 100644
--- a/sdks/python/apache_beam/yaml/generate_yaml_docs.py
+++ b/sdks/python/apache_beam/yaml/generate_yaml_docs.py
@@ -154,8 +154,9 @@ def normalize_error_handling(f):
                               PythonCallableWithSource.load_from_expression(
                                   param.type_name),
                               param.description) for param in doc.params
-                      ]))),
-          description=f.description)
+                      ])),
+              nullable=True),
+          description=f.description or doc.short_description)
     return f
 
   def lines():
diff --git a/sdks/python/apache_beam/yaml/yaml_errors.py b/sdks/python/apache_beam/yaml/yaml_errors.py
index c0d448473f42..dace44ca09f6 100644
--- a/sdks/python/apache_beam/yaml/yaml_errors.py
+++ b/sdks/python/apache_beam/yaml/yaml_errors.py
@@ -24,7 +24,7 @@
 
 
 class ErrorHandlingConfig(NamedTuple):
-  """Class to define Error Handling parameters.
+  """This option specifies whether and where to output error rows.
 
       Args:
         output (str): Name to use for the output error collection