diff --git a/server_privileges.php b/server_privileges.php
index 308739cf1..a9ebcd96b 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1451,7 +1451,9 @@ if( $GLOBALS['is_ajax_request'] && !isset($_REQUEST['export']) && (!isset($_REQU
         $extra_data['new_privileges'] = $new_privileges;
     }
 
-    PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
+    if ($message instanceof PMA_Message) {
+        PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
+    }
 }
 
 /**
diff --git a/tbl_row_action.php b/tbl_row_action.php
index cce3f7b38..b2f28fa4f 100644
--- a/tbl_row_action.php
+++ b/tbl_row_action.php
@@ -72,7 +72,7 @@ switch($submit_mult) {
 if (!empty($submit_mult)) {
     switch($submit_mult) {
         case 'row_edit':
-            // As we got the fields to be edited from the
+            // As we got the rows to be edited from the
             // 'rows_to_delete' checkbox, we use the index of it as the
             // indicating WHERE clause. Then we build the array which is used
             // for the tbl_change.php script.
@@ -89,7 +89,7 @@ if (!empty($submit_mult)) {
             // Needed to allow SQL export
             $single_table = TRUE;
 
-            // As we got the fields to be edited from the
+            // As we got the rows to be exported from the
             // 'rows_to_delete' checkbox, we use the index of it as the
             // indicating WHERE clause. Then we build the array which is used
             // for the tbl_change.php script.