diff --git a/zone/client.cpp b/zone/client.cpp
index 3dc69d563..a277b9858 100644
--- a/zone/client.cpp
+++ b/zone/client.cpp
@@ -8157,29 +8157,25 @@ void Client::PlayMP3(const char* fname)
 }
 
 void Client::ExpeditionSay(const char *str, int ExpID) {
-	char errbuf[MYSQL_ERRMSG_SIZE];
-	char* query = 0;
-	MYSQL_RES *result;
-	MYSQL_ROW row;
 
-	if (!database.RunQuery(query,MakeAnyLenString(&query, "SELECT `player_name` FROM `cust_inst_players` WHERE `inst_id` = %i", ExpID),errbuf,&result)){
-		safe_delete_array(query);
+	std::string query = StringFormat("SELECT `player_name` FROM `cust_inst_players` "
+                                    "WHERE `inst_id` = %i", ExpID);
+    auto results = database.QueryDatabase(query);
+	if (!results.Success())
 		return;
-	}
 
-	safe_delete_array(query);
+	if(results.RowCount() == 0) {
+        this->Message(14, "You say to the expedition, '%s'", str);
+        return;
+    }
 
-	if(result)
-		this->Message(14, "You say to the expedition, '%s'", str);
-
-	while((row = mysql_fetch_row(result))) {
-		const char* CharName = row[0];
-		if(strcmp(CharName, this->GetCleanName()) != 0)
-			worldserver.SendEmoteMessage(CharName, 0, 0, 14, "%s says to the expedition, '%s'", this->GetCleanName(), str);
+	for(auto row = results.begin(); row != results.end(); ++row) {
+		const char* charName = row[0];
+		if(strcmp(charName, this->GetCleanName()) != 0)
+			worldserver.SendEmoteMessage(charName, 0, 0, 14, "%s says to the expedition, '%s'", this->GetCleanName(), str);
 		// ChannelList->CreateChannel(ChannelName, ChannelOwner, ChannelPassword, true, atoi(row[3]));
 	}
 
-	mysql_free_result(result);
 
 }