diff --git a/src/main/java/org/violetmoon/zeta/registry/ZetaRegistry.java b/src/main/java/org/violetmoon/zeta/registry/ZetaRegistry.java
index 2106b37..a67b0e7 100644
--- a/src/main/java/org/violetmoon/zeta/registry/ZetaRegistry.java
+++ b/src/main/java/org/violetmoon/zeta/registry/ZetaRegistry.java
@@ -285,6 +285,6 @@ protected <O> void trackRegisteredObject(ResourceKey<Registry<O>> keyGeneric, Ho
 	 * Gets all the registered objects from this Zeta
 	 */
 	public <O> Collection<Holder<O>> getRegisteredObjects(ResourceKey<Registry<O>> registry) {
-		return (Collection<Holder<O>>) (Collection) myRegisteredObjects.get((ResourceKey) registry);
+		return (Collection<Holder<O>>) (Collection) myRegisteredObjects.getOrDefault((ResourceKey) registry, List.of());
 	}
 }
diff --git a/src/main/java/org/violetmoon/zetaimplforge/event/play/loading/ForgeZGatherAdditionalFlags.java b/src/main/java/org/violetmoon/zetaimplforge/event/play/loading/ForgeZGatherAdditionalFlags.java
index 330bf85..a0fdd66 100644
--- a/src/main/java/org/violetmoon/zetaimplforge/event/play/loading/ForgeZGatherAdditionalFlags.java
+++ b/src/main/java/org/violetmoon/zetaimplforge/event/play/loading/ForgeZGatherAdditionalFlags.java
@@ -4,6 +4,7 @@
 import org.violetmoon.zeta.config.ConfigFlagManager;
 import org.violetmoon.zeta.event.play.loading.ZGatherAdditionalFlags;
 
+@SuppressWarnings("removal")
 @Deprecated(forRemoval = true)
 public class ForgeZGatherAdditionalFlags extends Event implements ZGatherAdditionalFlags {