diff --git a/core/includes/update.inc b/core/includes/update.inc
index abaa2b1..683e7fe 100644
--- a/core/includes/update.inc
+++ b/core/includes/update.inc
@@ -182,6 +182,7 @@ function update_do_one($module, $number, $dependency_map, &$context) {
     // @TODO We may want to do different error handling for different
     // exception types, but for now we'll just log the exception and
     // return the message for printing.
+    // @see https://www.drupal.org/node/2564311
     catch (Exception $e) {
       watchdog_exception('update', $e);
 
@@ -246,6 +247,7 @@ function update_invoke_post_update($function, &$context) {
     // @TODO We may want to do different error handling for different exception
     // types, but for now we'll just log the exception and return the message
     // for printing.
+    // @see https://www.drupal.org/node/2564311
     catch (Exception $e) {
       watchdog_exception('update', $e);
 
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 3530453..c316884 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -609,7 +609,7 @@ function system_requirements($phase) {
         }
       }
     }
-    if (empty($requirements['update']['severity'])) {
+    if (!$has_pending_updates) {
       /** @var \Drupal\Core\Update\UpdateRegistry $post_update_registry */
       $post_update_registry = \Drupal::service('update.post_update_registry');
       $missing_post_update_functions = $post_update_registry->getPendingUpdateFunctions();