diff --git a/Spigot-API-Patches/Name-the-specific-custom-world-gen-plugin-class-that.patch b/Spigot-API-Patches/Name-the-specific-custom-world-gen-plugin-class-that.patch
new file mode 100644
index 0000000000..59867459ad
--- /dev/null
+++ b/Spigot-API-Patches/Name-the-specific-custom-world-gen-plugin-class-that.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Zach Brown <1254957+zachbr@users.noreply.github.com>
+Date: Wed, 2 Oct 2019 21:24:28 -0500
+Subject: [PATCH] Name the specific custom world gen plugin class that throws a
+ UOE
+
+
+diff --git a/src/main/java/org/bukkit/generator/ChunkGenerator.java b/src/main/java/org/bukkit/generator/ChunkGenerator.java
+index 9a18a05b..ccac5710 100644
+--- a/src/main/java/org/bukkit/generator/ChunkGenerator.java
++++ b/src/main/java/org/bukkit/generator/ChunkGenerator.java
+@@ -0,0 +0,0 @@ public abstract class ChunkGenerator {
+      */
+     @NotNull
+     public ChunkData generateChunkData(@NotNull World world, @NotNull Random random, int x, int z, @NotNull BiomeGrid biome) {
+-        throw new UnsupportedOperationException("Custom generator is missing required method generateChunkData");
++        // Paper start - More helpful custom chunk gen exceptions
++        final String generatorClass = world.getGenerator() != null ? world.getGenerator().getClass().getName() : "null";
++        throw new UnsupportedOperationException("Custom generator is missing required method generateChunkData: " + generatorClass);
++        // Paper end
+     }
+ 
+     /**
+--
\ No newline at end of file