diff --git a/lib/MySQL_HostGroups_Manager.cpp b/lib/MySQL_HostGroups_Manager.cpp
index 9ab8f019e..1059ee29f 100644
--- a/lib/MySQL_HostGroups_Manager.cpp
+++ b/lib/MySQL_HostGroups_Manager.cpp
@@ -512,7 +512,8 @@ static void * GTID_syncer_run() {
 	MyHGM->gtid_ev_timer = (struct ev_timer *)malloc(sizeof(struct ev_timer));
 	ev_async_init(MyHGM->gtid_ev_async, gtid_async_cb);
 	ev_async_start(MyHGM->gtid_ev_loop, MyHGM->gtid_ev_async);
-	ev_timer_init(MyHGM->gtid_ev_timer, gtid_timer_cb, __sync_add_and_fetch(&GloMTH->variables.binlog_reader_connect_retry_msec,0)/1000, 0);
+	//ev_timer_init(MyHGM->gtid_ev_timer, gtid_timer_cb, __sync_add_and_fetch(&GloMTH->variables.binlog_reader_connect_retry_msec,0)/1000, 0);
+	ev_timer_init(MyHGM->gtid_ev_timer, gtid_timer_cb, 3, 0);
 	ev_timer_start(MyHGM->gtid_ev_loop, MyHGM->gtid_ev_timer);
 	//ev_ref(gtid_ev_loop);
 	ev_run(MyHGM->gtid_ev_loop, 0);
@@ -2026,7 +2027,8 @@ void MySQL_HostGroups_Manager::push_MyConn_to_pool_array(MySQL_Connection **ca,
 	while (i<cnt) {
 		push_MyConn_to_pool(c,false);
 		i++;
-		c=ca[i];
+		if (i<cnt)
+			c=ca[i];
 	}
 	wrunlock();
 }
diff --git a/lib/MySQL_Protocol.cpp b/lib/MySQL_Protocol.cpp
index 1c58b2613..f48743f2a 100644
--- a/lib/MySQL_Protocol.cpp
+++ b/lib/MySQL_Protocol.cpp
@@ -596,7 +596,7 @@ bool MySQL_Protocol::generate_pkt_OK(bool send, void **ptr, unsigned int *len, u
 	}
 	memcpy(_ptr+l, &internal_status, sizeof(uint16_t)); l+=sizeof(uint16_t);
 	memcpy(_ptr+l, &warnings, sizeof(uint16_t)); l+=sizeof(uint16_t);
-	if (msg) {
+	if (msg && strlen(msg)) {
 		l+=write_encoded_length(_ptr+l, msg_len, msg_len_len, msg_prefix);
 		memcpy(_ptr+l, msg, msg_len);
 	}