diff --git a/CraftBukkit-Patches/0093-Try-and-Debug-Crash-Reports-Crashing.patch b/CraftBukkit-Patches/0093-Try-and-Debug-Crash-Reports-Crashing.patch
new file mode 100644
index 0000000000..64941ad90d
--- /dev/null
+++ b/CraftBukkit-Patches/0093-Try-and-Debug-Crash-Reports-Crashing.patch
@@ -0,0 +1,41 @@
+From 7a826c1e1d2348619e6cfd466c40c199ee4886a0 Mon Sep 17 00:00:00 2001
+From: md_5 <git@md-5.net>
+Date: Sun, 12 Jan 2014 20:56:41 +1100
+Subject: [PATCH] Try and Debug Crash Reports Crashing
+
+
+diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+index 868061b..c58c73e 100644
+--- a/src/main/java/net/minecraft/server/MinecraftServer.java
++++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+@@ -627,7 +627,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
+                 try {
+                     worldserver.doTick();
+                 } catch (Throwable throwable) {
++                    // Spigot Start
++                    try {
+                     crashreport = CrashReport.a(throwable, "Exception ticking world");
++                    } catch (Throwable t){
++                        throw new RuntimeException("Error generating crash report", t);
++                    }
++                    // Spigot End
+                     worldserver.a(crashreport);
+                     throw new ReportedException(crashreport);
+                 }
+@@ -635,7 +641,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
+                 try {
+                     worldserver.tickEntities();
+                 } catch (Throwable throwable1) {
++                    // Spigot Start
++                    try {
+                     crashreport = CrashReport.a(throwable1, "Exception ticking world entities");
++                    } catch (Throwable t){
++                        throw new RuntimeException("Error generating crash report", t);
++                    }
++                    // Spigot End
+                     worldserver.a(crashreport);
+                     throw new ReportedException(crashreport);
+                 }
+-- 
+1.8.3.2
+