diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc
index e70f34397d6..94246135d37 100644
--- a/libmysqld/lib_sql.cc
+++ b/libmysqld/lib_sql.cc
@@ -128,6 +128,8 @@ static MYSQL_FIELD * STDCALL emb_list_fields(MYSQL *mysql)
 static my_bool STDCALL emb_read_prepare_result(MYSQL *mysql, MYSQL_STMT *stmt)
 {
   THD *thd= (THD*)mysql->thd;
+  if (mysql->net.last_errno)
+    return 1;
   stmt->stmt_id= thd->client_stmt_id;
   stmt->param_count= thd->client_param_count;
   stmt->field_count= mysql->field_count;
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index ff1a8f8f8e6..3089bd670b2 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -169,6 +169,7 @@ static bool send_prep_stmt(PREP_STMT *stmt, uint columns __attribute__((unused))
 
   thd->client_stmt_id= stmt->stmt_id;
   thd->client_param_count= stmt->param_count;
+  thd->net.last_errno= 0;
 
   return 0;
 }