diff --git a/src/main/java/org/betterx/bclib/api/v2/tag/TagType.java b/src/main/java/org/betterx/bclib/api/v2/tag/TagType.java
index 284ec713..6ad2fc14 100644
--- a/src/main/java/org/betterx/bclib/api/v2/tag/TagType.java
+++ b/src/main/java/org/betterx/bclib/api/v2/tag/TagType.java
@@ -16,6 +16,7 @@ import com.google.common.collect.Sets;
 import org.betterx.bclib.BCLib;
 import org.betterx.bclib.api.v2.levelgen.biomes.InternalBiomeAPI;
 
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -106,6 +107,9 @@ public class TagType<T> {
     }
 
     public Set<TagEntry> getSetForTag(TagKey<T> tag) {
+        if (tag==null) {
+            return new HashSet<>();
+        }
         return getSetForTag(tag.location());
     }
 
diff --git a/src/main/java/org/betterx/bclib/world/structures/BCLStructure.java b/src/main/java/org/betterx/bclib/world/structures/BCLStructure.java
index 535bc80f..89a8fa31 100644
--- a/src/main/java/org/betterx/bclib/world/structures/BCLStructure.java
+++ b/src/main/java/org/betterx/bclib/world/structures/BCLStructure.java
@@ -11,6 +11,7 @@ import net.minecraft.world.level.levelgen.structure.placement.RandomSpreadType;
 
 import com.mojang.serialization.Codec;
 import org.betterx.bclib.api.v2.levelgen.structures.BCLStructureBuilder;
+import org.betterx.bclib.api.v2.tag.TagAPI;
 import org.betterx.bclib.util.MHelper;
 
 import java.util.function.Function;
@@ -63,7 +64,8 @@ public class BCLStructure<S extends Structure> extends org.betterx.bclib.api.v2.
                 separation,
                 adaptNoise,
                 Structure.simpleCodec(structureBuilder),
-                null);
+                TagAPI.makeStructureTag(id.getNamespace(), id.getPath())
+        );
     }
 
     @Deprecated(forRemoval = true)