diff --git a/xmysqlnd/xmysqlnd_protocol_frame_codec.cc b/xmysqlnd/xmysqlnd_protocol_frame_codec.cc
index 07346dc6..9f890fe8 100644
--- a/xmysqlnd/xmysqlnd_protocol_frame_codec.cc
+++ b/xmysqlnd/xmysqlnd_protocol_frame_codec.cc
@@ -61,7 +61,7 @@ XMYSQLND_METHOD(xmysqlnd_pfc, send)(XMYSQLND_PFC * const pfc,
 	size_t to_be_sent;
 
 	DBG_ENTER("xmysqlnd_pfc::send");
-	DBG_INF_FMT("count=" MYSQLND_SZ_T_SPEC, count);
+	DBG_INF_FMT("count=%zu", count);
 	if (!vio || FALSE == vio->data->m.has_valid_stream(vio)) {
 		DBG_RETURN(FAIL);
 	}
diff --git a/xmysqlnd/xmysqlnd_session.cc b/xmysqlnd/xmysqlnd_session.cc
index 4466181b..da134f0d 100644
--- a/xmysqlnd/xmysqlnd_session.cc
+++ b/xmysqlnd/xmysqlnd_session.cc
@@ -776,9 +776,7 @@ xmysqlnd_session_data::xmysqlnd_session_data(
 	if (error_info) {
 		error_info = mysqlnd_error_info? mysqlnd_error_info : &error_info_impl;
 	} else {
-		if (FAIL == mysqlnd_error_info_init(&error_info_impl, persistent)) {
-			throw std::runtime_error("mysqlnd_error_info_init failed");
-		}
+		mysqlnd_error_info_init(&error_info_impl, persistent);
 		error_info = &error_info_impl;
 	}