diff --git a/lib/MySQL_Session.cpp b/lib/MySQL_Session.cpp
index 1adc30360..11413030c 100644
--- a/lib/MySQL_Session.cpp
+++ b/lib/MySQL_Session.cpp
@@ -1762,18 +1762,6 @@ void MySQL_Session::handler___status_WAITING_CLIENT_DATA___STATE_SLEEP___MYSQL_C
 
 
 bool MySQL_Session::handler___status_WAITING_CLIENT_DATA___STATE_SLEEP___MYSQL_COM_QUERY_qpo(PtrSize_t *pkt) {
-	if (qpo->error_msg) {
-		client_myds->DSS=STATE_QUERY_SENT_NET;
-		client_myds->myprot.generate_pkt_ERR(true,NULL,NULL,1,1148,(char *)"#42000",qpo->error_msg);
-//		client_myds->DSS=STATE_SLEEP;
-//		status=WAITING_CLIENT_DATA;
-		l_free(pkt->size,pkt->ptr);
-//		CurrentQuery.end();
-//		GloQPro->delete_QP_out(qpo);
-//		qpo=NULL;
-		RequestEnd(NULL);
-		return true;
-	}
 	if (qpo->new_query) {
 		// the query was rewritten
 		l_free(pkt->size,pkt->ptr);	// free old pkt
@@ -1791,6 +1779,18 @@ bool MySQL_Session::handler___status_WAITING_CLIENT_DATA___STATE_SLEEP___MYSQL_C
 		CurrentQuery.begin((unsigned char *)pkt->ptr,pkt->size,true);
 		delete qpo->new_query;
 	}
+	if (qpo->error_msg) {
+		client_myds->DSS=STATE_QUERY_SENT_NET;
+		client_myds->myprot.generate_pkt_ERR(true,NULL,NULL,1,1148,(char *)"#42000",qpo->error_msg);
+//		client_myds->DSS=STATE_SLEEP;
+//		status=WAITING_CLIENT_DATA;
+		l_free(pkt->size,pkt->ptr);
+//		CurrentQuery.end();
+//		GloQPro->delete_QP_out(qpo);
+//		qpo=NULL;
+		RequestEnd(NULL);
+		return true;
+	}
 	if (mirror==true) { // for mirror session we exit here
 		current_hostgroup=qpo->destination_hostgroup;
 		return false;