diff --git a/sql/protocol.cc b/sql/protocol.cc
index 6bec4dbe47f..773bbe697a3 100644
--- a/sql/protocol.cc
+++ b/sql/protocol.cc
@@ -252,8 +252,9 @@ net_printf(THD *thd, uint errcode, ...)
   strmake(net->last_error, text_pos, length);
   strmake(net->sqlstate, mysql_errno_to_sqlstate(errcode), SQLSTATE_LENGTH);
 #endif
-  push_warning(thd, MYSQL_ERROR::WARN_LEVEL_ERROR, errcode,
-	       text_pos ? text_pos : ER(errcode));
+  if (!thd->killed)
+    push_warning(thd, MYSQL_ERROR::WARN_LEVEL_ERROR, errcode,
+                 text_pos ? text_pos : ER(errcode));
   thd->is_fatal_error=0;			// Error message is given
   DBUG_VOID_RETURN;
 }