2c2
< index 92d4454..7d73c84 100644
---
> index 352ffea..481698c 100644
5c5
< @@ -225,8 +225,12 @@ public function on404Html(FlattenException $exception, Request $request) {
---
> @@ -227,8 +227,12 @@ public function on404Html(FlattenException $exception, Request $request) {
20c20
< @@ -258,13 +262,35 @@ public function on500Html(FlattenException $exception, Request $request) {
---
> @@ -260,13 +264,35 @@ public function on500Html(FlattenException $exception, Request $request) {
58c58
< @@ -369,6 +395,7 @@ protected function decodeException(FlattenException $exception) {
---
> @@ -371,6 +397,7 @@ protected function decodeException(FlattenException $exception) {
66c66
< @@ -380,12 +407,12 @@ protected function decodeException(FlattenException $exception) {
---
> @@ -382,12 +409,12 @@ protected function decodeException(FlattenException $exception) {
80,99d79
<  
< diff --git a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
< index 60a9a77..63097fc 100644
< --- a/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
< +++ b/core/modules/simpletest/lib/Drupal/simpletest/TestBase.php
< @@ -1073,9 +1073,12 @@ protected function exceptionHandler($exception) {
<        'file' => $exception->getFile(),
<      ));
<      // The exception message is run through check_plain() by _drupal_decode_exception().
< -    $message = format_string('%type: !message in %function (line %line of %file). <pre class="backtrace">!backtrace</pre>', _drupal_decode_exception($exception) + array(
< -      '!backtrace' => format_backtrace($verbose_backtrace),
< -    ));
< +    $message = format_string(
< +      '%type: !message in %function (line %line of %file). <pre class="backtrace">backtrace</pre>',
< +      array(
< +        'backtrace' => format_backtrace($verbose_backtrace),
< +      ) + _drupal_decode_exception($exception)
< +    );
<      $this->error($message, 'Uncaught exception', _drupal_get_last_caller($backtrace));
<    }