diff --git a/Documentation/TopLevelObjects/Plugin.rst b/Documentation/TopLevelObjects/Plugin.rst
index 1707e702..252a98b3 100644
--- a/Documentation/TopLevelObjects/Plugin.rst
+++ b/Documentation/TopLevelObjects/Plugin.rst
@@ -225,6 +225,45 @@ plugins.
         Same as :ref:`setup-plugin-mvc-callDefaultActionIfActionCantBeResolved`
         but this will raise a "page not found" error.
 
+    ..  confval:: mvc.showPageNotFoundIfTargetNotFoundException
+        :name: plugin-mvc-showPageNotFoundIfTargetNotFoundException
+        :type: :ref:`data-type-boolean`
+        :Default: `false`
+
+        **Only for Extbase plugins**. By default, when calling an extbase controller action
+        that is not registered for an Extbase plugin, a fatal exception
+        :php:`TargetNotFoundException` is thrown
+        (usually an internal error message is shown).
+
+        When this configuration option is set to `1` (true), instead the default
+        "Page not Found" page will be shown instead (with a 404 HTTP header by default).
+
+        The configuration option can be either set on the global `config.tx_extbase`
+        scope, or also plugin-specific via
+        `plugin.tx_yourextension.mvc.showPageNotFoundIfTargetNotFoundException` /
+        `plugin.tx_yourextension_pluginName.mvc.showPageNotFoundIfTargetNotFoundException`.
+
+    ..  confval:: mvc.showPageNotFoundIfRequiredArgumentIsMissingException
+        :name: plugin-mvc-showPageNotFoundIfRequiredArgumentIsMissingException
+        :type: :ref:`data-type-boolean`
+        :Default: `false`
+
+        **Only for Extbase plugins**. By default, when calling an extbase controller action
+        with missing/invalid required arguments a fatal exception :php:`RequiredArgumentMissingException`
+        is thrown (usually an internal error message is shown).
+
+        When this configuration option is set to `1` (true), instead the default
+        "Page not Found" page will be shown instead (with a 404 HTTP header by default).
+
+        The configuration option can be either set on the global `config.tx_extbase`
+        scope, or also plugin-specific via
+        `plugin.tx_yourextension.mvc.showPageNotFoundIfRequiredArgumentIsMissingException` /
+        `plugin.tx_yourextension_pluginName.mvc.showPageNotFoundIfRequiredArgumentIsMissingException`.
+
+        Note that extension authors can also implement the Controller method
+        :php:`ActionController->handleArgumentMappingExceptions()` to individually operate
+        on invalid arguments.
+
     ..  confval:: format
         :name: plugin-format
         :type: :ref:`data-type-string`