diff --git a/patches/minecraft/net/minecraft/tags/Tag.java.patch b/patches/minecraft/net/minecraft/tags/Tag.java.patch
index 1f76c53475..69fbf0f7d8 100644
--- a/patches/minecraft/net/minecraft/tags/Tag.java.patch
+++ b/patches/minecraft/net/minecraft/tags/Tag.java.patch
@@ -34,7 +34,7 @@
 -      jsonobject.addProperty("replace", false);
 +      jsonobject.addProperty("replace", replace);
        jsonobject.add("values", jsonarray);
-+      jsonobject.add("optional", optional);
++      if (optional.size() > 0) jsonobject.add("optional", optional);
        return jsonobject;
     }
  
diff --git a/src/main/java/net/minecraftforge/fml/RegistryObject.java b/src/main/java/net/minecraftforge/fml/RegistryObject.java
index cf2d9d366b..5eb2e57eaf 100644
--- a/src/main/java/net/minecraftforge/fml/RegistryObject.java
+++ b/src/main/java/net/minecraftforge/fml/RegistryObject.java
@@ -88,7 +88,7 @@ public final class RegistryObject<T extends IForgeRegistryEntry<? super T>> impl
     public T get()
     {
         T ret = this.value;
-        Objects.requireNonNull(ret, "Registry Object not present");
+        Objects.requireNonNull(ret, () -> "Registry Object not present: " + this.name);
         return ret;
     }