2 files changed, 11 insertions, 5 deletions
diff --git a/phpBB/phpbb/event/kernel_exception_subscriber.php b/phpBB/phpbb/event/kernel_exception_subscriber.php
index b6b34675f0..01940a4fa9 100644
--- a/phpBB/phpbb/event/kernel_exception_subscriber.php
+++ b/phpBB/phpbb/event/kernel_exception_subscriber.php
@@ -54,8 +54,6 @@ class kernel_exception_subscriber implements EventSubscriberInterface
 	*/
 	public function on_kernel_exception(GetResponseForExceptionEvent $event)
 	{
-		page_header($this->user->lang('INFORMATION'));
-
 		$exception = $event->getException();
 
 		$message = $exception->getMessage();
@@ -67,6 +65,8 @@ class kernel_exception_subscriber implements EventSubscriberInterface
 
 		if (!$event->getRequest()->isXmlHttpRequest())
 		{
+			page_header($this->user->lang('INFORMATION'));
+
 			$this->template->assign_vars(array(
 				'MESSAGE_TITLE' => $this->user->lang('INFORMATION'),
 				'MESSAGE_TEXT'  => $message,
@@ -83,7 +83,11 @@ class kernel_exception_subscriber implements EventSubscriberInterface
 		else
 		{
 			$data = array();
-			$data['message'] = $message;
+
+			if (!empty($message))
+			{
+				$data['message'] = $message;
+			}
 
 			if (defined('DEBUG'))
 			{
diff --git a/phpBB/phpbb/exception/http_exception.php b/phpBB/phpbb/exception/http_exception.php
index 57604d49d4..f733462a05 100644
--- a/phpBB/phpbb/exception/http_exception.php
+++ b/phpBB/phpbb/exception/http_exception.php
@@ -13,10 +13,12 @@
 
 namespace phpbb\exception;
 
+use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
+
 /**
  * Class http_exception
  */
-class http_exception extends exception implements exception_interface
+class http_exception extends exception implements HttpExceptionInterface
 {
 	/**
 	 * Http status code.
@@ -47,7 +49,7 @@ class http_exception extends exception implements exception_interface
 		$this->status_code = $status_code;
 		$this->headers = $headers;
 
-		parent::__construct($message, $code, $previous);
+		parent::__construct($message, $parameters, $previous, $code);
 	}
 
 	/**