diff --git a/core/modules/views_ui/src/Form/Ajax/ConfigHandlerGroup.php b/core/modules/views_ui/src/Form/Ajax/ConfigHandlerGroup.php
index fba13ea..69631a4 100644
--- a/core/modules/views_ui/src/Form/Ajax/ConfigHandlerGroup.php
+++ b/core/modules/views_ui/src/Form/Ajax/ConfigHandlerGroup.php
@@ -65,12 +65,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       ),
     );
     $executable = $view->getExecutable();
-    if (!$executable->setDisplay($display_id)) {
-      views_ajax_render($this->t('Invalid display id @display', array('@display' => $display_id)));
-    }
-
-    $executable->initQuery();
-
+    $executable->setDisplay($display_id);
     $item = $executable->getHandler($display_id, $type, $id);
 
     if ($item) {
diff --git a/core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php b/core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php
index 54ba06e..24fe7b2 100644
--- a/core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php
+++ b/core/modules/views_ui/src/Form/Ajax/RearrangeFilter.php
@@ -41,9 +41,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
 
     $types = ViewExecutable::getHandlerTypes();
     $executable = $view->getExecutable();
-    if (!$executable->setDisplay($display_id)) {
-      views_ajax_render($this->t('Invalid display id @display', array('@display' => $display_id)));
-    }
+    $executable->setDisplay($display_id);
     $display = $executable->displayHandlers->get($display_id);
     $form['#title'] = String::checkPlain($display->display['display_title']) . ': ';
     $form['#title'] .= $this->t('Rearrange @type', array('@type' => $types[$type]['ltitle']));