diff --git a/sql/protocol.cc b/sql/protocol.cc
index bf8faec006a..713f4ed3d25 100644
--- a/sql/protocol.cc
+++ b/sql/protocol.cc
@@ -76,6 +76,12 @@ void net_send_error(THD *thd, uint sql_errno, const char *err)
 
   DBUG_ASSERT(!thd->spcont);
 
+  if (thd->killed == THD::KILL_QUERY || thd->killed == THD::KILL_BAD_DATA)
+  {
+    thd->killed= THD::NOT_KILLED;
+    thd->mysys_var->abort= 0;
+  }
+
   if (net && net->no_send_error)
   {
     thd->clear_error();
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index a43d8335b9e..df425557bdf 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -788,12 +788,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
   NET *net= &thd->net;
   bool error= 0;
   DBUG_ENTER("dispatch_command");
-
-  if (thd->killed == THD::KILL_QUERY || thd->killed == THD::KILL_BAD_DATA)
-  {
-    thd->killed= THD::NOT_KILLED;
-    thd->mysys_var->abort= 0;
-  }
+  DBUG_PRINT("info",("packet: '%*.s'; command: %d", packet_length, packet, command));
 
   thd->command=command;
   /*