diff --git a/Bukkit-Patches/0006-Debug-for-Event-Exceptions.patch b/Bukkit-Patches/0006-Debug-for-Event-Exceptions.patch
new file mode 100644
index 0000000000..044083452f
--- /dev/null
+++ b/Bukkit-Patches/0006-Debug-for-Event-Exceptions.patch
@@ -0,0 +1,26 @@
+From 871c6282b0b5235cc498518c2adf9ff51cf6554f Mon Sep 17 00:00:00 2001
+From: md_5 <md_5@live.com.au>
+Date: Thu, 14 Mar 2013 20:37:25 +1100
+Subject: [PATCH] Debug for Event Exceptions.
+
+---
+ src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+index 9c7288e..37b67b9 100644
+--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
++++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+@@ -424,6 +424,9 @@ public class JavaPluginLoader implements PluginLoader {
+                         }
+                         method.invoke(listener, event);
+                     } catch (InvocationTargetException ex) {
++                        server.getLogger().warning("==== Start Spigot Debug ===");
++                        ex.printStackTrace();
++                        server.getLogger().warning("==== End Spigot Debug ===");
+                         throw new EventException(ex.getCause());
+                     } catch (Throwable t) {
+                         throw new EventException(t);
+-- 
+1.8.1-rc2
+