diff --git a/core/lib/Drupal/Core/Config/StorageComparer.php b/core/lib/Drupal/Core/Config/StorageComparer.php
index 03a904bea7..255ff30050 100644
--- a/core/lib/Drupal/Core/Config/StorageComparer.php
+++ b/core/lib/Drupal/Core/Config/StorageComparer.php
@@ -388,6 +388,8 @@ public function hasChanges() {
   public function validateSiteUuid() {
     $source = $this->sourceStorage->read('system.site');
     $target = $this->targetStorage->read('system.site');
+    // It is possible that the storage does not contain system.site
+    // configuraion. In such cases the site UUID cannot be valid.
     return $source && $target && $source['uuid'] === $target['uuid'];
   }
 
diff --git a/core/modules/language/src/LanguageServiceProvider.php b/core/modules/language/src/LanguageServiceProvider.php
index b463bb6ef6..a7e934aab6 100644
--- a/core/modules/language/src/LanguageServiceProvider.php
+++ b/core/modules/language/src/LanguageServiceProvider.php
@@ -87,11 +87,9 @@ protected function isMultilingual() {
   protected function getDefaultLanguageValues() {
     $config_storage = BootstrapConfigStorageFactory::get();
     $system = $config_storage->read('system.site');
-    if ($system) {
-      $default_language = $config_storage->read(static::CONFIG_PREFIX . $system['default_langcode']);
-      if (is_array($default_language)) {
-        return $default_language;
-      }
+    $default_language = $config_storage->read(static::CONFIG_PREFIX . $system['default_langcode']);
+    if (is_array($default_language)) {
+      return $default_language;
     }
     return FALSE;
   }