A few fixes

src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java

@@ -28,7 +28,7 @@ import net.minecraftforge.fml.common.registry.RegistryDelegate.Delegate;
 
 public class FMLControlledNamespacedRegistry<I> extends RegistryNamespacedDefaultedByKey<ResourceLocation, I>
 {
-    public static final boolean DEBUG = Boolean.parseBoolean(System.getProperty("fml.debugRegistryEntries", "true"));
+    public static final boolean DEBUG = Boolean.parseBoolean(System.getProperty("fml.debugRegistryEntries", "false"));
     private final Class<I> superType;
     private final boolean isDelegated;
     private final Field delegateAccessor;

src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java

@@ -256,6 +256,7 @@ public class PersistentRegistryManager
         if (!PersistentRegistry.FROZEN.isPopulated())
         {
             FMLLog.warning("Can't revert to frozen GameData state without freezing first.");
+            return;
         }
         else
         {