diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
index 5cae913..28d5c94 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
@@ -1585,14 +1585,16 @@ public function buildOptionsForm(&$form, &$form_state) {
           $this->view->query->buildOptionsForm($form['query']['options'], $form_state);
         }
         break;
-      case 'field_language':
+      case 'field_langcode':
         $form['#title'] .= t('Field Language');
 
         $entities = entity_get_info();
         $entity_tables = array();
         $has_translation_handlers = FALSE;
-        foreach ($entities as $type => $entity_info) {
-          $entity_tables[] = $entity_info['base_table'];
+        foreach ($entities as $entity_info) {
+          if (isset($entity_info['base_table'])) {
+            $entity_tables[] = $entity_info['base_table'];
+          }
 
           if (!empty($entity_info['translation'])) {
             $has_translation_handlers = TRUE;