diff --git a/core/modules/content_translation/src/ContentTranslationManager.php b/core/modules/content_translation/src/ContentTranslationManager.php
index 3a21f94..a7fcdcc 100644
--- a/core/modules/content_translation/src/ContentTranslationManager.php
+++ b/core/modules/content_translation/src/ContentTranslationManager.php
@@ -95,7 +95,7 @@ public function isEnabled($entity_type_id, $bundle = NULL) {
       $bundles = !empty($bundle) ? [$bundle] : array_keys($this->entityManager->getBundleInfo($entity_type_id));
       foreach ($bundles as $bundle) {
         $config = $this->loadContentLanguageSettings($entity_type_id, $bundle);
-        if ($config->getThirdPartySetting('content_translation', 'enabled', FALSE)) {
+        if (!is_null($config) && $config->getThirdPartySetting('content_translation', 'enabled', FALSE)) {
           $enabled = TRUE;
           break;
         }
@@ -119,7 +119,9 @@ public function setBundleTranslationSettings($entity_type_id, $bundle, array $se
    */
   public function getBundleTranslationSettings($entity_type_id, $bundle) {
     $config = $this->loadContentLanguageSettings($entity_type_id, $bundle);
-    return $config->getThirdPartySetting('content_translation', 'bundle_settings', []);
+    if (!is_null($config)) {
+      return $config->getThirdPartySetting('content_translation', 'bundle_settings', []);
+    }
   }
 
   /**
@@ -130,9 +132,10 @@ public function getBundleTranslationSettings($entity_type_id, $bundle) {
    * @param string $bundle
    *   Bundle name.
    *
-   * @return \Drupal\language\Entity\ContentLanguageSettings
+   * @return \Drupal\language\Entity\ContentLanguageSettings|null
    *   The content language config entity if one exists. Otherwise, returns
-   *   default values.
+   *   default values. If no entity type id or bundle is provided, it will
+   *   return null.
    */
   protected function loadContentLanguageSettings($entity_type_id, $bundle) {
     if ($entity_type_id == NULL || $bundle == NULL) {