diff --git a/common/database.cpp b/common/database.cpp
index 038937591..23bff5861 100644
--- a/common/database.cpp
+++ b/common/database.cpp
@@ -2443,38 +2443,22 @@ void Database::BuryCorpsesInInstance(uint16 instance_id)
 
 uint16 Database::GetInstanceVersion(uint16 instance_id)
 {
-	if(instance_id < 1)
+	if(instance_id == 0)
 		return 0;
 
-	char errbuf[MYSQL_ERRMSG_SIZE];
-	char *query = 0;
-	MYSQL_RES *result;
-	MYSQL_ROW row;
-	uint32 ret;
+	char *query = nullptr;
 
-	if (RunQuery(query, MakeAnyLenString(&query, "SELECT version FROM instance_list where id=%u", instance_id),
-		errbuf, &result))
-	{
-		safe_delete_array(query);
-		if (mysql_num_rows(result) != 0)
-		{
-			row = mysql_fetch_row(result);
-			ret = atoi(row[0]);
-			mysql_free_result(result);
-			return ret;
-		}
-		else
-		{
-			mysql_free_result(result);
-			return 0;
-		}
-	}
-	else
-	{
-		safe_delete_array(query);
+	auto results = QueryDatabase(query, MakeAnyLenString(&query, "SELECT version FROM instance_list where id=%u", instance_id));
+	safe_delete_array(query);
+	
+	if (!results.Success())
 		return 0;
-	}
-	return 0;
+
+	if (results.RowCount() == 0)
+		return 0;
+
+	auto row = results.begin();
+	return atoi(row[0]);
 }
 
 uint16 Database::GetInstanceID(const char* zone, uint32 charid, int16 version)