diff --git a/modules/protocol/mysql_client.c b/modules/protocol/mysql_client.c
index 568ffffdb..d82fe22ae 100644
--- a/modules/protocol/mysql_client.c
+++ b/modules/protocol/mysql_client.c
@@ -179,87 +179,6 @@ mysql_send_ok(DCB *dcb, int packet_number, int in_affected_rows, const char* mys
 	return sizeof(mysql_packet_header) + mysql_payload_size;
 }
 
-/**
- * mysql_send_custom_error
- *
- * Send a MySQL protocol Generic ERR message, to the dcb
- * Note the errno and state are still fixed now
- *
- * @param dcb Descriptor Control Block for the connection to which the OK is sent
- * @param packet_number
- * @param in_affected_rows
- * @param mysql_message
- * @return packet length
- *
- */
-
-int
-mysql_send_custom_error (DCB *dcb, int packet_number, int in_affected_rows, const char* mysql_message) {
-        uint8_t *outbuf = NULL;
-        uint8_t mysql_payload_size = 0;
-        uint8_t mysql_packet_header[4];
-        uint8_t *mysql_payload = NULL;
-        uint8_t field_count = 0;
-        uint8_t mysql_err[2];
-        uint8_t mysql_statemsg[6];
-        unsigned int mysql_errno = 0;
-        const char *mysql_error_msg = NULL;
-        const char *mysql_state = NULL;
-
-	GWBUF   *buf;
-
-        mysql_errno = 2003;
-        mysql_error_msg = "An errorr occurred ...";
-        mysql_state = "HY000";
-
-        field_count = 0xff;
-        gw_mysql_set_byte2(mysql_err, mysql_errno);
-        mysql_statemsg[0]='#';
-        memcpy(mysql_statemsg+1, mysql_state, 5);
-
-	if (mysql_message != NULL) {
-		mysql_error_msg = mysql_message;
-	}
-
-        mysql_payload_size = sizeof(field_count) + sizeof(mysql_err) + sizeof(mysql_statemsg) + strlen(mysql_error_msg);
-
-        // allocate memory for packet header + payload
-	if ((buf = gwbuf_alloc(sizeof(mysql_packet_header) + mysql_payload_size)) == NULL)
-	{
-		return 0;
-	}
-	outbuf = GWBUF_DATA(buf);
-
-        // write packet header with packet number
-        gw_mysql_set_byte3(mysql_packet_header, mysql_payload_size);
-        mysql_packet_header[3] = packet_number;
-
-        // write header
-        memcpy(outbuf, mysql_packet_header, sizeof(mysql_packet_header));
-
-        mysql_payload = outbuf + sizeof(mysql_packet_header);
-
-        // write field
-        memcpy(mysql_payload, &field_count, sizeof(field_count));
-        mysql_payload = mysql_payload + sizeof(field_count);
-
-        // write errno
-        memcpy(mysql_payload, mysql_err, sizeof(mysql_err));
-        mysql_payload = mysql_payload + sizeof(mysql_err);
-
-        // write sqlstate
-        memcpy(mysql_payload, mysql_statemsg, sizeof(mysql_statemsg));
-        mysql_payload = mysql_payload + sizeof(mysql_statemsg);
-
-        // write err messg
-        memcpy(mysql_payload, mysql_error_msg, strlen(mysql_error_msg));
-
-	// writing data in the Client buffer queue
-	dcb->func.write(dcb, buf);
-
-	return sizeof(mysql_packet_header) + mysql_payload_size;
-}
-
 /**
  * mysql_send_auth_error
  *
diff --git a/modules/protocol/mysql_common.c b/modules/protocol/mysql_common.c
index 06b2bdca1..4651f26aa 100644
--- a/modules/protocol/mysql_common.c
+++ b/modules/protocol/mysql_common.c
@@ -523,7 +523,7 @@ gw_mysql_protocol_state2string (int state) {
  *
  */
 int
-gw_backend_send_custom_error (DCB *dcb, int packet_number, int in_affected_rows, const char* mysql_message) {
+mysql_send_custom_error (DCB *dcb, int packet_number, int in_affected_rows, const char* mysql_message) {
         uint8_t *outbuf = NULL;
         uint8_t mysql_payload_size = 0;
         uint8_t mysql_packet_header[4];