diff --git a/core/modules/field/src/Plugin/migrate/source/d6/FieldInstance.php b/core/modules/field/src/Plugin/migrate/source/d6/FieldInstance.php
index 9235903..8247a1d 100644
--- a/core/modules/field/src/Plugin/migrate/source/d6/FieldInstance.php
+++ b/core/modules/field/src/Plugin/migrate/source/d6/FieldInstance.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\field\Plugin\migrate\source\d6;
 
+use Drupal\migrate\Exception\RequirementsException;
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
@@ -23,6 +24,16 @@ class FieldInstance extends DrupalSqlBase {
   /**
    * {@inheritdoc}
    */
+  public function checkRequirements() {
+    parent::checkRequirements();
+    if (!$this->getDatabase()->schema()->tableExists('content_node_field_instance')) {
+      throw new RequirementsException('The table content_node_field_instance does not exist');
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
   public function query() {
     $query = $this->select('content_node_field_instance', 'cnfi')->fields('cnfi');
     if (isset($this->configuration['node_type'])) {
diff --git a/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php b/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php
old mode 100755
new mode 100644
index feb5788..a6fa1d8
--- a/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php
+++ b/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\field\Plugin\migrate\source\d7;
 
+use Drupal\migrate\Exception\RequirementsException;
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
@@ -22,6 +23,16 @@ class FieldInstance extends DrupalSqlBase {
   /**
    * {@inheritdoc}
    */
+  public function checkRequirements() {
+    parent::checkRequirements();
+    if (!$this->getDatabase()->schema()->tableExists('field_config_instance')) {
+      throw new RequirementsException('The table field_config_instance does not exist');
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
   public function query() {
     $query = $this->select('field_config_instance', 'fci')
       ->fields('fci')
diff --git a/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php b/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php
index b3e74de..7496d90 100644
--- a/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php
+++ b/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php
@@ -130,11 +130,10 @@ protected function testMigrateUpgrade() {
     }
     $edits = $this->translatePostValues($edit);
 
-    // Ensure submitting the form with invalid credentials gives us a nice
-    // warning.
-    $this->drupalPostForm(NULL, [$driver . '[password]' => 'wrong'] + $edits, t('Review upgrade'));
+    // Ensure submitting the form with invalid database credentials gives us a
+    // nice warning.
+    $this->drupalPostForm(NULL, [$driver . '[database]' => 'wrong'] + $edits, t('Review upgrade'));
     $this->assertText('Resolve the issue below to continue the upgrade.');
-    $this->assertText('Access denied for user');
 
     $this->drupalPostForm(NULL, $edits, t('Review upgrade'));
     $this->assertResponse(200);