diff --git a/core/modules/migrate/src/Plugin/IdAuditingMigration.php b/core/modules/migrate/src/Plugin/IdAuditingMigration.php
index 383e02a..74983a4 100644
--- a/core/modules/migrate/src/Plugin/IdAuditingMigration.php
+++ b/core/modules/migrate/src/Plugin/IdAuditingMigration.php
@@ -20,22 +20,24 @@ public function audit() {
 
     $destination = $this->getDestinationPlugin();
     $id_map = $this->getIdMap();
-    if ($destination instanceof MaximumValueInterface && $id_map instanceof MaximumValueInterface && $destination->max() > $id_map->max()) {
-      $base_id = $this->getBaseId();
-      $conflict[$base_id] = $base_id;
+    if ($destination instanceof MaximumValueInterface && $id_map instanceof MaximumValueInterface) {
+      if ($destination->max() > $id_map->max()) {
+        $base_id = $this->getBaseId();
+        $conflict[$base_id] = $base_id;
 
-      $label = $this->label();
-      if (is_string($label)) {
-        $conflict[$base_id] = $label;
-      }
-      elseif ($label instanceof TranslatableMarkup) {
-        $arguments = $label->getArguments();
-        $conflict[$base_id] = isset($arguments['@label']) ? $arguments['@label'] : $label->render();
+        $label = $this->label();
+        if (is_string($label)) {
+          $conflict[$base_id] = $label;
+        }
+        elseif ($label instanceof TranslatableMarkup) {
+          $arguments = $label->getArguments();
+          $conflict[$base_id] = isset($arguments['@label']) ? $arguments['@label'] : $label->render();
+        }
       }
       return $conflict;
     }
 
-    throw new InvalidPluginDefinitionException($this->getPluginId());
+    throw new InvalidPluginDefinitionException($this->getPluginId(), sprintf('Migration %s implements %s but does not have a destination or id map that implements %s', $this->getPluginId(), self::class, MaximumValueInterface::class));
   }
 
 }
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/FieldMigration.php b/core/modules/migrate_drupal/src/Plugin/migrate/FieldMigration.php
index b4f3569..3ca8f26 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/FieldMigration.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/FieldMigration.php
@@ -5,9 +5,9 @@
 use Drupal\Component\Plugin\Exception\PluginNotFoundException;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\migrate\Exception\RequirementsException;
-use Drupal\migrate\Plugin\IdAuditingMigration;
 use Drupal\migrate\Plugin\MigrateDestinationPluginManager;
 use Drupal\migrate\Plugin\MigratePluginManager;
+use Drupal\migrate\Plugin\Migration;
 use Drupal\migrate\Plugin\MigrationPluginManagerInterface;
 use Drupal\migrate\Plugin\RequirementsInterface;
 use Drupal\migrate_drupal\Plugin\MigrateCckFieldPluginManagerInterface;
@@ -17,7 +17,7 @@
 /**
  * Migration plugin class for migrations dealing with field config and values.
  */
-class FieldMigration extends IdAuditingMigration implements ContainerFactoryPluginInterface {
+class FieldMigration extends Migration implements ContainerFactoryPluginInterface {
 
   /**
    * Defines which configuration option has the migration processing function.