diff --git a/common/database.cpp b/common/database.cpp
index 8fe75aa8d..0e29c41bb 100644
--- a/common/database.cpp
+++ b/common/database.cpp
@@ -1165,13 +1165,14 @@ bool Database::LoadZoneNames() {
 }
 
 uint32 Database::GetZoneID(const char* zonename) {
-	if (zonename == 0)
+
+	if (zonename == nullptr)
 		return 0;
-	for (auto iter = zonename_array.begin(); iter != zonename_array.end(); ++iter) {
-		if (strcasecmp(iter->second.c_str(), zonename) == 0) {
+
+	for (auto iter = zonename_array.begin(); iter != zonename_array.end(); ++iter)
+		if (strcasecmp(iter->second.c_str(), zonename) == 0)
 			return iter->first;
-		}
-	}
+
 	return 0;
 }