diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php
index 454e3a2..3ee5a93 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/UpgradePathTestBase.php
@@ -245,6 +245,11 @@ protected function performUpgrade($register_errors = TRUE) {
       throw new Exception('POST to update.php to apply pending updates did not return HTTP 200 status.');
     }
 
+    if (!$this->assertNoText(t('An unrecoverable error has occurred.'))) {
+      // Error occured during update process.
+      throw new Exception('POST to update.php to apply pending updates detected an unrecoverable error.');
+    }
+
     // Check for errors during the update process.
     foreach ($this->xpath('//li[@class=:class]', array(':class' => 'failure')) as $element) {
       $message = strip_tags($element->asXML());
diff --git a/core/modules/system/tests/upgrade/drupal-7.language.database.php b/core/modules/system/tests/upgrade/drupal-7.language.database.php
index 5687361..169995b 100644
--- a/core/modules/system/tests/upgrade/drupal-7.language.database.php
+++ b/core/modules/system/tests/upgrade/drupal-7.language.database.php
@@ -519,11 +519,11 @@
 ))
 ->values(array(
   'nid' => '50',
-  'cid' => '0',
+  'cid' => '2',
   'last_comment_timestamp' => '1314997642',
-  'last_comment_name' => NULL,
+  'last_comment_name' => 'test user 4',
   'last_comment_uid' => '6',
-  'comment_count' => '1',
+  'comment_count' => '2',
 ))
 ->execute();