diff --git a/src/main/java/dev/latvian/mods/kubejs/core/TagLoaderKJS.java b/src/main/java/dev/latvian/mods/kubejs/core/TagLoaderKJS.java
index 125955bd1..0cfd95bb6 100644
--- a/src/main/java/dev/latvian/mods/kubejs/core/TagLoaderKJS.java
+++ b/src/main/java/dev/latvian/mods/kubejs/core/TagLoaderKJS.java
@@ -81,7 +81,7 @@ public interface TagLoaderKJS<T> {
 		kjs$resources.kjs$getServerScriptManager().getRegistries().cacheTags(reg, map);
 
 		if (DataExport.export != null) {
-			var loc = "tags/" + objStorage + "/";
+			var loc = "tags/" + objStorage.key.location() + "/";
 
 			for (var entry : map.entrySet()) {
 				var list = new ArrayList<String>();
diff --git a/src/main/java/dev/latvian/mods/kubejs/util/RegistryAccessContainer.java b/src/main/java/dev/latvian/mods/kubejs/util/RegistryAccessContainer.java
index d863c28e8..25e7ab212 100644
--- a/src/main/java/dev/latvian/mods/kubejs/util/RegistryAccessContainer.java
+++ b/src/main/java/dev/latvian/mods/kubejs/util/RegistryAccessContainer.java
@@ -97,6 +97,10 @@ public Map<String, ItemStack> itemStackParseCache() {
 	public <T> void cacheTags(Registry<T> registry, Map<ResourceLocation, List<TagLoader.EntryWithSource>> map) {
 		var key1 = (ResourceKey) registry.key();
 
+		if (key1 == null) {
+			return;
+		}
+
 		if (key1 == Registries.ITEM) {
 			cachedItemTags = Cast.to(new CachedItemTagLookup((Registry) registry, map));
 			cachedRegistryTags.put(key1, Pair.of(registry, cachedItemTags));