diff --git a/core/lib/Drupal/Core/Config/ConfigImporterEvent.php b/core/lib/Drupal/Core/Config/ConfigImporterEvent.php
index 393f3a1..8286813 100644
--- a/core/lib/Drupal/Core/Config/ConfigImporterEvent.php
+++ b/core/lib/Drupal/Core/Config/ConfigImporterEvent.php
@@ -38,7 +38,7 @@ public function getConfigImporter() {
   }
 
   /**
-   * Gets the list of differences that will be imported.
+   * Gets the list of changes that will be imported.
    *
    * @param string $op
    *   (optional) A change operation. Either delete, create or update. If
diff --git a/core/lib/Drupal/Core/Entity/Event/BundleConfigImportValidate.php b/core/lib/Drupal/Core/Entity/Event/BundleConfigImportValidate.php
index 5a1e2c8..58ca1a2 100644
--- a/core/lib/Drupal/Core/Entity/Event/BundleConfigImportValidate.php
+++ b/core/lib/Drupal/Core/Entity/Event/BundleConfigImportValidate.php
@@ -55,8 +55,8 @@ public function onConfigImporterValidate(ConfigImporterEvent $event) {
     foreach ($event->getChangelist('delete') as $config_name) {
       // Get the config entity type ID. This also ensure we are dealing with a
       // configuration entity.
-      $entity_type_id = $this->configManager->getEntityTypeIdByName($config_name);
-      if ($entity_type_id && ($entity_type = $this->entityManager->getDefinition($entity_type_id))) {
+      if ($entity_type_id = $this->configManager->getEntityTypeIdByName($config_name)) {
+        $entity_type = $this->entityManager->getDefinition($entity_type_id);
         // Does this entity type define a bundle of another entity type.
         if ($bundle_of = $entity_type->getBundleOf()) {
           // Work out if there are entities with this bundle.