diff --git a/common/database.cpp b/common/database.cpp
index d4f237ec3..fb5d439a0 100644
--- a/common/database.cpp
+++ b/common/database.cpp
@@ -2708,22 +2708,23 @@ bool Database::GetAdventureStats(uint32 char_id, uint32 &guk_w, uint32 &mir_w, u
 	return true;
 }
 
-uint32 Database::GetGuildDBIDByCharID(uint32 char_id) {
-	char errbuf[MYSQL_ERRMSG_SIZE];
-	char *query = 0;
-	MYSQL_RES *result;
-	int retVal = 0;
+uint32 Database::GetGuildIDByCharID(uint32 char_id) 
+{
+	char *query = nullptr;
 
-	if (RunQuery(query, MakeAnyLenString(&query, "SELECT guild_id FROM guild_members WHERE char_id='%i'", char_id), errbuf, &result)) {
-		if (mysql_num_rows(result) == 1) {
-			MYSQL_ROW row = mysql_fetch_row(result);
-			retVal = atoi(row[0]);
-		}
-		mysql_free_result(result);
-	}
-	else {
-		std::cerr << "Error in GetAccountIDByChar query '" << query << "' " << errbuf << std::endl;
+	auto results = QueryDatabase(query, MakeAnyLenString(&query, "SELECT guild_id FROM guild_members WHERE char_id='%i'", char_id));
+
+	if (!results.Success())
+	{
+		std::cerr << "Error in GetGuildIDByChar query '" << query << "' " << results.ErrorMessage() << std::endl;
+		safe_delete_array(query);
+		return 0;
 	}
 	safe_delete_array(query);
-	return retVal;
+
+	if (results.RowCount() == 0)
+		return 0;
+
+	auto row = results.begin();
+	return atoi(row[0]);
 }
diff --git a/common/database.h b/common/database.h
index c7adc7666..2e26a7b90 100644
--- a/common/database.h
+++ b/common/database.h
@@ -130,7 +130,7 @@ public:
 	uint32	GetAccountIDByChar(const char* charname, uint32* oCharID = 0);
 	uint32	GetAccountIDByChar(uint32 char_id);
 	uint32	GetAccountIDByName(const char* accname, int16* status = 0, uint32* lsid = 0);
-	uint32	GetGuildDBIDByCharID(uint32 char_id);
+	uint32	GetGuildIDByCharID(uint32 char_id);
 	void	GetAccountName(uint32 accountid, char* name, uint32* oLSAccountID = 0);
 	void	GetCharName(uint32 char_id, char* name);
 	uint32	GetCharacterInfo(const char* iName, uint32* oAccID = 0, uint32* oZoneID = 0, uint32* oInstanceID = 0,float* oX = 0, float* oY = 0, float* oZ = 0);