diff --git a/phpBB/includes/event/kernel_exception_subscriber.php b/phpBB/includes/event/kernel_exception_subscriber.php
index e843df2e68..f90989a74c 100644
--- a/phpBB/includes/event/kernel_exception_subscriber.php
+++ b/phpBB/includes/event/kernel_exception_subscriber.php
@@ -18,7 +18,7 @@ if (!defined('IN_PHPBB'))
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpFoundation\Response;
 
 class phpbb_event_kernel_exception_subscriber implements EventSubscriberInterface
@@ -71,7 +71,7 @@ class phpbb_event_kernel_exception_subscriber implements EventSubscriberInterfac
 		page_footer(true, false, false);
 
 
-		$status_code = $exception instanceof NotFoundHttpException ? $exception->getStatusCode() : 500;
+		$status_code = $exception instanceof HttpException ? $exception->getStatusCode() : 500;
 		$response = new Response($this->template->assign_display('body'), $status_code);
 		$event->setResponse($response);
 	}
diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index c7b585354e..f28b321942 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -121,7 +121,10 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 		$this->phpbb_extension_manager->purge('foo/bar');
 	}
 
-	public function test_exception_thrown_status_code()
+	/**
+	* Check the status code resulting from an exception thrown by a controller
+	*/
+	public function test_exception_should_result_in_500_status_code()
 	{
 		$this->phpbb_extension_manager->enable('foo/bar');
 		$crawler = $this->request('GET', 'app.php?controller=foo/exception');
@@ -142,8 +145,6 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	public function test_error_ext_disabled_or_404()
 	{
 		$crawler = $this->request('GET', 'app.php?controller=does/not/exist');
-		// This is 500 response because the exception is thrown from within Symfony
-		// and does not provide a exception code, so we assign it 500 by default
 		$this->assertEquals(404, $this->client->getResponse()->getStatus());
 		$this->assertContains('No route found for "GET /does/not/exist"', $crawler->filter('body')->text());
 	}