diff --git a/src/Core/Resource/CWorld.cpp b/src/Core/Resource/CWorld.cpp
index 3f6c9240..a458e493 100644
--- a/src/Core/Resource/CWorld.cpp
+++ b/src/Core/Resource/CWorld.cpp
@@ -43,7 +43,9 @@ void CWorld::SetAreaLayerInfo(CGameArea *pArea)
 
     for (uint32 iLyr = 0; iLyr < pArea->NumScriptLayers(); iLyr++)
     {
-        if (AreaInfo.Layers.size() <= iLyr) break;
+        if (AreaInfo.Layers.size() <= iLyr)
+            break;
+
         CScriptLayer *pLayer = pArea->ScriptLayer(iLyr);
         SArea::SLayer& rLayerInfo = AreaInfo.Layers[iLyr];
 
@@ -78,7 +80,7 @@ uint32 CWorld::AreaIndex(CAssetID AreaID) const
             return AreaIdx;
     }
 
-    return -1;
+    return UINT32_MAX;
 }
 
 // ************ SERIALIZATION ************