diff --git a/common/database.cpp b/common/database.cpp
index e39543475..aa3fffb5e 100644
--- a/common/database.cpp
+++ b/common/database.cpp
@@ -1133,28 +1133,23 @@ bool Database::GetZoneLongName(const char* short_name, char** long_name, char* f
 	return true;
 }
 uint32 Database::GetZoneGraveyardID(uint32 zone_id, uint32 version) {
-	char errbuf[MYSQL_ERRMSG_SIZE];
-	char *query = 0;
-	MYSQL_RES *result;
-	MYSQL_ROW row;
-	uint32 GraveyardID = 0;
+	char *query = nullptr;
 
-	if (RunQuery(query, MakeAnyLenString(&query, "SELECT graveyard_id FROM zone WHERE zoneidnumber='%u' AND (version=%i OR version=0) ORDER BY version DESC", zone_id, version), errbuf, &result))
+	auto results = QueryDatabase(query, MakeAnyLenString(&query, "SELECT graveyard_id FROM zone WHERE zoneidnumber='%u' AND (version=%i OR version=0) ORDER BY version DESC", zone_id, version));
+
+	if (!results.Success())
 	{
-		if (mysql_num_rows(result) > 0) {
-			row = mysql_fetch_row(result);
-			GraveyardID = atoi(row[0]);
-		}
-		mysql_free_result(result);
+		std::cerr << "Error in GetZoneGraveyardID query '" << query << "' " << results.ErrorMessage() << std::endl;
 		safe_delete_array(query);
-		return GraveyardID;
-	}
-	else
-	{
-		std::cerr << "Error in GetZoneGraveyardID query '" << query << "' " << errbuf << std::endl;
+		return 0;
 	}
 	safe_delete_array(query);
-	return GraveyardID;
+
+	if (results.RowCount() == 0)
+		return 0;
+
+	auto row = results.begin();
+	return atoi(row[0]);
 }
 
 bool Database::GetZoneGraveyard(const uint32 graveyard_id, uint32* graveyard_zoneid, float* graveyard_x, float* graveyard_y, float* graveyard_z, float* graveyard_heading) {