symfony
diff --git a/‎src/Symfony/Bundle/FrameworkB 8000 undle/Resources/config/web.xml
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/FrameworkB 8000 undle/Resources/config/web.xml
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
Lines changed: 13 additions & 0 deletions b/‎src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
Lines changed: 13 additions & 0 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/Tests/EventListener/ExceptionListenerTest.php
Lines changed: 8 additions & 1 deletion b/‎src/Symfony/Component/HttpKernel/Tests/EventListener/ExceptionListenerTest.php
Lines changed: 8 additions & 1 deletion
@@ -68,7 +68,7 @@
         </service>
 
         <service id="http_exception_listener" class="Symfony\Component\HttpKernel\EventListener\ExceptionListener">
-            <tag name="kernel.event_listener" event="kernel.exception" method="onKernelException" priority="-256"/>
+            <tag name="kernel.event_listener" event="kernel.exception" method="onKernelException" priority="-2048" />
             <tag name="monolog.logger" channel="request" />
             <argument>null</argument>
             <argument type="service" id="logger" on-invalid="null" />
 
@@ -49,6 +49,19 @@ public function __construct($controller, LoggerInterface $logger = null, $debug
 
     public function onKernelException(GetResponseForExceptionEvent $event)
     {
+        if (null === $this->controller) {
+            $terminating = false;
+            foreach (debug_backtrace() as $frame) {
+                if (isset($frame['object']) && $event->getKernel() === $frame['object'] && 'terminateWithException' === $frame['function']) {
+                    $terminating = true;
+                    break;
+                }
+            }
+
+            if (!$terminating) {
+                return;
+            }
+        }
         $exception = $event->getException();
         $request = $event->getRequest();
         $eventDispatcher = func_num_args() > 2 ? func_get_arg(2) : null;
 
@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
+use Symfony\Component\HttpKernel\HttpKernel;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\EventListener\ExceptionListener;
 use Symfony\Component\HttpKernel\KernelEvents;
@@ -155,7 +156,7 @@ public function testCSPHeaderIsRemoved()
     public function testNullController()
     {
         $listener = new ExceptionListener(null);
-        $kernel = $this->getMockBuilder('Symfony\Component\HttpKernel\HttpKernelInterface')->getMock();
+        $kernel = $this->getMockBuilder(HttpKernel::class)->disableOriginalConstructor()->getMock();
         $kernel->expects($this->once())->method('handle')->will($this->returnCallback(function (Request $request) {
             $controller = $request->attributes->get('_controller');
 
@@ -166,6 +167,12 @@ public function testNullController()
 
         $listener->onKernelException($event);
 
+        $this->assertNull($event->getResponse());
+
+        $kernel->expects($this->once())->method('terminateWithException')->will($this->returnCallback(function () use ($listener, $event) {
+            $listener->onKernelException($event);
+        }));
+        $kernel->terminateWithException(new \Exception('foo'));
         $this->assertContains('Whoops, looks like something went wrong.', $event->getResponse()->getContent());
     }
 }