diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 8ff7379..35710e8 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -940,9 +940,9 @@ function _drupal_get_filename_fallback($type, $name, $trigger_error, $database_u
     $file_scans['#write_cache'] = TRUE;
   }
 
-  // If requested, trigger a user-level warning about the missing or
+  // If requested, trigger a user-level notice about the missing or
   // unexpectedly moved file. If the database was unavailable, do not trigger a
-  // warning in the latter case, though, since if the {system} table could not
+  // notice in the latter case, though, since if the {system} table could not
   // be queried there is no way to know if the location found here was
   // "unexpected" or not.
   if ($trigger_error) {
@@ -1058,7 +1058,7 @@ function _drupal_get_filename_perform_file_scan($type, $name) {
 }
 
 /**
- * Triggers a user-level warning for missing or unexpectedly moved files.
+ * Triggers a user-level notice for missing or unexpectedly moved files.
  *
  * @param $type
  *   The type of the item (theme, theme_engine, module, profile).
@@ -1085,10 +1085,10 @@ function _drupal_get_filename_fallback_trigger_error($type, $name, $error_type)
     // triggered during low-level operations that cannot necessarily be
     // interrupted by a watchdog() call.
     if ($error_type == 'missing') {
-      _drupal_trigger_error_with_delayed_logging(format_string('The following @type is missing from the file system: %name. For information about how to fix this, see <a href="@documentation">the documentation page</a>.', array('@type' => $type, '%name' => $name, '@documentation' => 'https://www.drupal.org/node/2487215')), E_USER_WARNING);
+      _drupal_trigger_error_with_delayed_logging(format_string('The following @type is missing from the file system: %name. For information about how to fix this, see <a href="@documentation">the documentation page</a>.', array('@type' => $type, '%name' => $name, '@documentation' => 'https://www.drupal.org/node/2487215')));
     }
     elseif ($error_type == 'moved') {
-      _drupal_trigger_error_with_delayed_logging(format_string('The following @type has moved within the file system: %name. In order to fix this, clear caches or put the @type back in its original location. For more information, see <a href="@documentation">the documentation page</a>.', array('@type' => $type, '%name' => $name, '@documentation' => 'https://www.drupal.org/node/2487215')), E_USER_WARNING);
+      _drupal_trigger_error_with_delayed_logging(format_string('The following @type has moved within the file system: %name. In order to fix this, clear caches or put the @type back in its original location. For more information, see <a href="@documentation">the documentation page</a>.', array('@type' => $type, '%name' => $name, '@documentation' => 'https://www.drupal.org/node/2487215')));
     }
     $errors_triggered[$type][$name][$error_type] = TRUE;
   }
diff --git a/includes/errors.inc b/includes/errors.inc
index 7393148..9605fa7 100644
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -238,8 +238,9 @@ function _drupal_log_error($error, $fatal = FALSE) {
       $class = 'error';
 
       // If error type is 'User notice' then treat it as debug information
-      // instead of an error message, see dd().
-      if ($error['%type'] == 'User notice') {
+      // instead of an error message, unless we know it came from somewhere
+      // other than debug().
+      if ($error['%type'] == 'User notice' && !drupal_static('_drupal_trigger_error_with_delayed_logging')) {
         $error['%type'] = 'Debug';
         $class = 'status';
       }