diff --git a/src/Symfony/Framework/WebBundle/DependencyInjection/WebExtension.php b/src/Symfony/Framework/WebBundle/DependencyInjection/WebExtension.php
index 4c0fa839e2..7b8f048c67 100644
--- a/src/Symfony/Framework/WebBundle/DependencyInjection/WebExtension.php
+++ b/src/Symfony/Framework/WebBundle/DependencyInjection/WebExtension.php
@@ -154,11 +154,6 @@ class WebExtension extends LoaderExtension
$loader = new XmlFileLoader(__DIR__.'/../Resources/config');
$configuration->merge($loader->load($this->resources['debug']));
- if (isset($config['exception']) && $config['exception'])
- {
- $configuration->merge($loader->load('debug_exception_handler.xml'));
- }
-
if (isset($config['toolbar']) && $config['toolbar'])
{
$configuration->merge($loader->load('debug_data_collector.xml'));
diff --git a/src/Symfony/Framework/WebBundle/Resources/config/debug_exception_handler.xml b/src/Symfony/Framework/WebBundle/Resources/config/debug_exception_handler.xml
deleted file mode 100644
index 4576a9c943..0000000000
--- a/src/Symfony/Framework/WebBundle/Resources/config/debug_exception_handler.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
- Symfony\Framework\WebBundle\Listener\ExceptionHandler
- WebBundle
- Exception
- exception
-
-
-
-
-
-
-
- %debug.exception_handler.bundle%
- %debug.exception_handler.controller%
- %debug.exception_handler.action%
-
-
-
diff --git a/src/Symfony/Framework/WebBundle/Resources/config/web.xml b/src/Symfony/Framework/WebBundle/Resources/config/web.xml
index af474e4c80..66f8d2e033 100644
--- a/src/Symfony/Framework/WebBundle/Resources/config/web.xml
+++ b/src/Symfony/Framework/WebBundle/Resources/config/web.xml
@@ -9,6 +9,11 @@
Symfony\Framework\WebBundle\Listener\ControllerLoader
Symfony\Components\Routing\Router
Symfony\Framework\WebBundle\Listener\ResponseFilter
+
+ Symfony\Framework\WebBundle\Listener\ExceptionHandler
+ WebBundle
+ Exception
+ exception
@@ -43,5 +48,14 @@
+
+
+
+
+
+ %exception_handler.bundle%
+ %exception_handler.controller%
+ %exception_handler.action%
+