diff --git a/core/modules/config/lib/Drupal/config/ConfigEntityBase.php b/core/modules/config/lib/Drupal/config/ConfigEntityBase.php
index 11effae..affaf24 100644
--- a/core/modules/config/lib/Drupal/config/ConfigEntityBase.php
+++ b/core/modules/config/lib/Drupal/config/ConfigEntityBase.php
@@ -93,10 +93,8 @@ abstract class ConfigEntityBase extends Entity implements ConfigEntityInterface
     $a_weight = isset($a->weight) ? $a->weight : 0;
     $b_weight = isset($b->weight) ? $b->weight : 0;
     if ($a_weight == $b_weight) {
-      $a_label = $a->label();
-      $a_label = isset($a_label) ? $a_label : '';
-      $b_label = $b->label();
-      $b_label = isset($b_label) ? $b_label : '';
+      $a_label = $a->label() ?: '';
+      $b_label = $b->label() ?: '';
       return strnatcasecmp($a_label, $b_label);
     }
     return ($a_weight < $b_weight) ? -1 : 1;
diff --git a/core/modules/taxonomy/taxonomy.install b/core/modules/taxonomy/taxonomy.install
index 22bb078..fb7063a 100644
--- a/core/modules/taxonomy/taxonomy.install
+++ b/core/modules/taxonomy/taxonomy.install
@@ -206,6 +206,7 @@ function taxonomy_field_schema($field) {
 function taxonomy_update_8001() {
   $descriptions = array(
     'taxonomy_term_data' => 'The {language}.langcode of this term.',
+    'taxonomy_vocabulary' => 'The {language}.langcode of this vocabulary.',
   );
   foreach ($descriptions as $table => $description) {
     $langcode_field = array(
@@ -278,8 +279,7 @@ function taxonomy_update_8003() {
       ->set('description', $vocabulary->description)
       ->set('hierarchy', $vocabulary->hierarchy)
       ->set('weight', $vocabulary->weight)
-      // @todo Re-visit later when property patch lands.
-      ->set('langcode', language_default()->langcode)
+      ->set('langcode', $vocabulary->langcode)
       ->save();
   }
 }