diff --git a/engine/breeze/world/map.c b/engine/breeze/world/map.c
index d1e742e..46095cd 100644
--- a/engine/breeze/world/map.c
+++ b/engine/breeze/world/map.c
@@ -148,6 +148,7 @@ BzTileMap bzTileMapCreate(const BzTileMapDesc *desc) {
             handleTileLayer(layer, cuteLayer);
             if (layerDesc->handler && !layerDesc->handler(layer)) {
                 bzFree(layer->data);
+                layer->data = NULL;
                 layer->dataCount = 0;
             }
             map.layerCount++;
@@ -160,6 +161,7 @@ BzTileMap bzTileMapCreate(const BzTileMapDesc *desc) {
             handleTileObjectLayer(objectLayer, cuteLayer, hashFunc);
             if (objectLayerDesc->handler && !objectLayerDesc->handler(objectLayer)) {
                 bzFree(objectLayer->objects);
+                objectLayer->objects = NULL;
                 objectLayer->objectCount = 0;
             }
             map.objectLayerCount++;