diff --git a/js/tbl_structure.js b/js/tbl_structure.js
index 3f49260fef..fb510353cc 100644
--- a/js/tbl_structure.js
+++ b/js/tbl_structure.js
@@ -338,8 +338,14 @@ $(document).ready(function() {
                 }
 
             } else {
-                var temp_div = $("<div id='temp_div'><div>").append(data.error);
-                var error = $(temp_div).find(".error code").addClass("error");
+                if(data.error != undefined) {
+                    var temp_div = $("<div id='temp_div'><div>").append(data.error);
+                    if($(temp_div).find(".error code").length != 0) {
+                        var error = $(temp_div).find(".error code").addClass("error");
+                    } else {
+                        var error = temp_div;
+                    }
+                }
                 PMA_ajaxShowMessage(error);
             }
 
diff --git a/tbl_indexes.php b/tbl_indexes.php
index d93018c76d..39205f24df 100644
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -108,6 +108,10 @@ if (isset($_REQUEST['do_save_data'])) {
         require './tbl_structure.php';
         exit;
     } else {
+        if( $GLOBALS['is_ajax_request'] == true) {
+            $extra_data['error'] = $error;
+            PMA_ajaxResponse($error,false);
+        }
         $error->display();
     }
 } // end builds the new index