diff --git a/libraries/classes/Import.php b/libraries/classes/Import.php
index 56c29e77a6..f95e7435fc 100644
--- a/libraries/classes/Import.php
+++ b/libraries/classes/Import.php
@@ -252,10 +252,15 @@ class Import
                     unset($sqlData['valid_full']);
                     for ($i = 0; $i < $count; $i++) {
                         $this->executeQuery($queries[$i], $fulls[$i], $sqlData);
+                        if ($GLOBALS['error']) {
+                            break;
+                        }
                     }
                 }
 
-                $this->executeQuery($import_run_buffer['sql'], $import_run_buffer['full'], $sqlData);
+                if (! $GLOBALS['error']) {
+                    $this->executeQuery($import_run_buffer['sql'], $import_run_buffer['full'], $sqlData);
+                }
             }
         } elseif (! empty($import_run_buffer['full'])) {
             if ($go_sql) {
diff --git a/libraries/classes/Plugins/Import/ImportSql.php b/libraries/classes/Plugins/Import/ImportSql.php
index a881c1f238..e313d34633 100644
--- a/libraries/classes/Plugins/Import/ImportSql.php
+++ b/libraries/classes/Plugins/Import/ImportSql.php
@@ -161,6 +161,10 @@ class ImportSql extends ImportPlugin
             $this->import->runQuery($statement, $statement, $sql_data);
         }
 
+        if ($GLOBALS['error']) {
+            return;
+        }
+
         // Finishing.
         $this->import->runQuery('', '', $sql_data);
     }