diff --git a/includes/admin.inc b/includes/admin.inc
index b6a967ad5d9ae9e60fe3c5ab695e33510d6eaaa8..808621811888f21374b8821efee58f32a380f415 100644
--- a/includes/admin.inc
+++ b/includes/admin.inc
@@ -10,6 +10,7 @@
 use Drupal\views\View;
 use Drupal\views\Analyzer;
 use Drupal\views\Plugin\Type\ViewsPluginManager;
+use Drupal\views\Plugin\views\wizard\WizardException;
 
 /**
  * Create an array of Views admin CSS for adding or attaching.
@@ -672,7 +673,7 @@ function views_ui_add_form_save_submit($form, &$form_state) {
   try {
     $view = $form_state['wizard_instance']->create_view($form, $form_state);
   }
-  catch (ViewsWizardException $e) {
+  catch (WizardException $e) {
     drupal_set_message($e->getMessage(), 'error');
     $form_state['redirect'] = 'admin/structure/views';
   }
@@ -699,7 +700,7 @@ function views_ui_add_form_store_edit_submit($form, &$form_state) {
   try {
     $view = $form_state['wizard_instance']->create_view($form, $form_state);
   }
-  catch (ViewsWizardException $e) {
+  catch (WizardException $e) {
     drupal_set_message($e->getMessage(), 'error');
     $form_state['redirect'] = 'admin/structure/views';
   }
diff --git a/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php b/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
index 878598b04a374b15f3ced9625c842d28e6c054a1..c15ec4ff051de30bdb0d53f99684559f59663bbb 100644
--- a/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
@@ -1065,7 +1065,7 @@ function validate($form, &$form_state) {
    * @return
    *   The created view object.
    *
-   * @throws ViewsWizardException
+   * @throws Drupal\views\Plugin\views\wizard\WizardException
    */
   function create_view($form, &$form_state) {
     $view = $this->retrieve_validated_view($form, $form_state);