diff --git a/phpBB/common.php b/phpBB/common.php
index 5627ccd976..eba2e8eca9 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -95,6 +95,8 @@ include($phpbb_root_path . 'includes/functions_compatibility.' . $phpEx);
 require($phpbb_root_path . 'includes/constants.' . $phpEx);
 require($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
 
+// Registered before building the container so the development environment stay capable of intercepting
+// the container builder exceptions.
 if (PHPBB_ENVIRONMENT === 'development')
 {
 	\phpbb\debug\debug::enable();
@@ -128,6 +130,11 @@ catch (InvalidArgumentException $e)
 	}
 }
 
+if ($phpbb_container->getParameter('debug.error_handler'))
+{
+	\phpbb\debug\debug::enable();
+}
+
 $phpbb_class_loader->set_cache($phpbb_container->get('cache.driver'));
 $phpbb_class_loader_ext->set_cache($phpbb_container->get('cache.driver'));
 
diff --git a/phpBB/config/development/config.yml b/phpBB/config/development/config.yml
index 37a690e036..1e273a3bb4 100644
--- a/phpBB/config/development/config.yml
+++ b/phpBB/config/development/config.yml
@@ -13,6 +13,7 @@ core:
         show_errors: true
         url_generator: true
         url_matcher: true
+        error_handler: true
 
     twig:
         debug: true
diff --git a/phpBB/phpbb/di/extension/container_configuration.php b/phpBB/phpbb/di/extension/container_configuration.php
index e74ae33e9b..c0f3080953 100644
--- a/phpBB/phpbb/di/extension/container_configuration.php
+++ b/phpBB/phpbb/di/extension/container_configuration.php
@@ -42,6 +42,7 @@ class container_configuration implements ConfigurationInterface
 						->booleanNode('show_errors')->defaultValue(false)->end()
 						->booleanNode('url_generator')->defaultValue(false)->end()
 						->booleanNode('url_matcher')->defaultValue(false)->end()
+						->booleanNode('error_handler')->defaultValue(false)->end()
 					->end()
 				->end()
 				->arrayNode('twig')