diff --git a/core/includes/errors.inc b/core/includes/errors.inc
index 8b0b9e4..8dc68d4 100644
--- a/core/includes/errors.inc
+++ b/core/includes/errors.inc
@@ -216,10 +216,10 @@ function _drupal_log_error($error, $fatal = FALSE) {
     }
 
     if ($fatal) {
-      // We fallback to a maintenance page at this point, because the page generation
-      // itself can generate errors.
+      // Fallback to a maintenance page, because the page generation itself can
+      // generate errors.
       // Should not translate the string to avoid errors producing more errors.
-      $message = 'The website has encountered an error. Please try again later.';
+      $message = 'The website has encountered an unexpected error. Please try again later.';
       if ($is_installer) {
         // install_display_output() prints the output and ends script execution.
         $output = array(
diff --git a/core/lib/Drupal/Core/Controller/ExceptionController.php b/core/lib/Drupal/Core/Controller/ExceptionController.php
index 320cb06..614a382 100644
--- a/core/lib/Drupal/Core/Controller/ExceptionController.php
+++ b/core/lib/Drupal/Core/Controller/ExceptionController.php
@@ -315,7 +315,7 @@ public function on500Html(FlattenException $exception, Request $request) {
       drupal_set_message($message, $class, TRUE);
     }
 
-    $content = $this->t('The website has encountered an error. Please try again later.');
+    $content = $this->t('The website has encountered an unexpected error. Please try again later.');
     $output = DefaultHtmlPageRenderer::renderPage($content, $this->t('Error'));
     $response = new Response($output);
     $response->setStatusCode(500, '500 Service unavailable (with message)');