diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index e2cfac7..5acdd60 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -6,9 +6,7 @@
  */
 
 use Drupal\Component\Utility\String;
-use Drupal\Core\Entity\ContentEntityType;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityForm;
+use Drupal\Core\Entity\EntityFormInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
@@ -187,14 +185,13 @@ function language_configuration_element_submit(&$form, FormStateInterface $form_
       // In case we are editing a bundle, we must check the new bundle name,
       // because e.g. hook_ENTITY_update fired before.
       $form_object = $form_state->getFormObject();
-      if ($form_object instanceof EntityForm && !$form_object->getEntity()->isNew() && ($form_object->getOperation() === 'default' || $form_object->getOperation() === 'edit')) {
-        /** @var EntityForm $form_object */
+      if ($form_object instanceof EntityFormInterface && !$form_object->getEntity()->isNew() && in_array($form_object->getOperation(), ['default', 'edit'])) {
+        /** @var EntityFormInterface $form_object */
         $entity = $form_object->getEntity();
         if ($entity->getEntityType()->getBundleOf()) {
           $bundle = $entity->id();
         }
       }
-      /** @var ContentLanguageSettings $config */
       $config = ContentLanguageSettings::loadByEntityTypeBundle($entity_type_id, $bundle);
       $config->setDefaultLangcode($form_state->getValue(array($element_name, 'langcode')));
       $config->setLanguageAlterable($form_state->getValue(array($element_name, 'language_alterable')));
diff --git a/core/modules/language/src/ContentLanguageSettingsException.php b/core/modules/language/src/ContentLanguageSettingsException.php
new file mode 100644
index 0000000..75592f5
--- /dev/null
+++ b/core/modules/language/src/ContentLanguageSettingsException.php
@@ -0,0 +1,13 @@
+<?php
+
+/*
+ * @file
+ * Contains \Drupal\language\ContentLanguageSettingsException.
+ */
+
+namespace Drupal\language;
+
+/**
+ * Exception thrown by ContentLanguageSettings when target bundle is not set.
+ */
+class ContentLanguageSettingsException extends \RuntimeException {}
diff --git a/core/modules/language/src/ContentLanguageSettingsInterface.php b/core/modules/language/src/ContentLanguageSettingsInterface.php
index 206bd14..56f8472 100644
--- a/core/modules/language/src/ContentLanguageSettingsInterface.php
+++ b/core/modules/language/src/ContentLanguageSettingsInterface.php
@@ -81,19 +81,5 @@ public function isLanguageAlterable();
    */
   public function isDefaultConfiguration();
 
-  /**
-   * Loads a content language config entity based on the entity type and bundle.
-   *
-   * @param string $entity_type_id
-   *   ID of the entity type.
-   * @param string $bundle
-   *   Bundle name.
-   *
-   * @return static
-   *   The content language config entity if one exists. Otherwise, returns
-   *   default values.
-   */
-  public static function loadByEntityTypeBundle($entity_type_id, $bundle);
-
 }
 
diff --git a/core/modules/language/src/Entity/ContentLanguageSettings.php b/core/modules/language/src/Entity/ContentLanguageSettings.php
index 11ef39c..1fee9de 100644
--- a/core/modules/language/src/Entity/ContentLanguageSettings.php
+++ b/core/modules/language/src/Entity/ContentLanguageSettings.php
@@ -7,10 +7,12 @@
 
 namespace Drupal\language\Entity;
 
+use Drupal\Component\Utility\String;
 use Drupal\Core\Config\Entity\ConfigEntityBase;
 use Drupal\Core\Config\Entity\ThirdPartySettingsTrait;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Language\LanguageInterface;
+use Drupal\language\ContentLanguageSettingsException;
 use Drupal\language\ContentLanguageSettingsInterface;
 
 /**
@@ -66,6 +68,32 @@ class ContentLanguageSettings extends ConfigEntityBase implements ContentLanguag
   protected $language_alterable = FALSE;
 
   /**
+   * Constructs a ContentLanguageSettings object.
+   *
+   * In most cases, Field entities are created via
+   * entity_create('field_config', $values), where $values is the same
+   * parameter as in this constructor.
+   *
+   * @param array $values
+   *   An array of the referring entity bundle with:
+   *   - target_entity_type_id: The entity type.
+   *   - target_bundle: The bundle.
+   *   Other array elements will be used to set the corresponding properties on
+   *   the class; see the class property documentation for details.
+   *
+   * @see entity_create()
+   */
+  public function __construct(array $values, $entity_type = 'language_content_settings') {
+    if (empty($values['target_entity_type_id'])) {
+      throw new ContentLanguageSettingsException('Attempt to create content language settings without a target_entity_type_id.');
+    }
+    if (empty($values['target_bundle'])) {
+      throw new ContentLanguageSettingsException('Attempt to create content language settings without a target_bundle.');
+    }
+    parent::__construct($values, $entity_type);
+  }
+
+  /**
    * {@inheritdoc}
    */
   public function id() {
@@ -143,7 +171,16 @@ public function isDefaultConfiguration() {
   }
 
   /**
-   * {@inheritdoc}
+   * Loads a content language config entity based on the entity type and bundle.
+   *
+   * @param string $entity_type_id
+   *   ID of the entity type.
+   * @param string $bundle
+   *   Bundle name.
+   *
+   * @return $this
+   *   The content language config entity if one exists. Otherwise, returns
+   *   default values.
    */
   public static function loadByEntityTypeBundle($entity_type_id, $bundle) {
     $config = \Drupal::entityManager()->getStorage('language_content_settings')->load($entity_type_id . '.' . $bundle);
@@ -162,7 +199,9 @@ public function calculateDependencies() {
     if ($bundle_entity_type_id != 'bundle') {
       // If the target entity type uses entities to manage its bundles then
       // depend on the bundle entity.
-      $bundle_entity = $this->entityManager()->getStorage($bundle_entity_type_id)->load($this->target_bundle);
+      if (!$bundle_entity = $this->entityManager()->getStorage($bundle_entity_type_id)->load($this->target_bundle)) {
+        throw new \LogicException(String::format('Missing bundle entity, entity type %type, entity id %bundle.', array('%type' => $bundle_entity_type_id, '%bundle' => $this->target_bundle)));
+      }
       $this->addDependency('config', $bundle_entity->getConfigDependencyName());
     }
     return $this->dependencies;