diff --git a/world/worlddb.cpp b/world/worlddb.cpp
index 2e486eb56..cac9fd7e8 100644
--- a/world/worlddb.cpp
+++ b/world/worlddb.cpp
@@ -416,26 +416,18 @@ bool WorldDatabase::GetStartZoneSoF(PlayerProfile_Struct* in_pp, CharCreate_Stru
 }
 
 void WorldDatabase::GetLauncherList(std::vector<std::string> &rl) {
-	char errbuf[MYSQL_ERRMSG_SIZE];
-	char* query = 0;
-	MYSQL_RES *result;
-	MYSQL_ROW row;
-
 	rl.clear();
 
-	if (RunQuery(query, MakeAnyLenString(&query,
-			"SELECT name FROM launcher" )
-		, errbuf, &result))
-	{
-		while ((row = mysql_fetch_row(result))) {
-			rl.push_back(row[0]);
-		}
-		mysql_free_result(result);
-	}
-	else {
-		LogFile->write(EQEMuLog::Error, "WorldDatabase::GetLauncherList: %s", errbuf);
-	}
-	safe_delete_array(query);
+    const std::string query = "SELECT name FROM launcher";
+    auto results = QueryDatabase(query);
+    if (!results.Success()) {
+        LogFile->write(EQEMuLog::Error, "WorldDatabase::GetLauncherList: %s", results.ErrorMessage().c_str());
+        return;
+    }
+
+    for (auto row = results.begin(); row != results.end(); ++row)
+        rl.push_back(row[0]);
+
 }
 
 void WorldDatabase::SetMailKey(int CharID, int IPAddress, int MailKey) {