diff --git a/src/main/java/buttondevteam/discordplugin/EventExceptionDiscordSender.java b/src/main/java/buttondevteam/discordplugin/EventExceptionDiscordSender.java
new file mode 100644
index 0000000..965b7c9
--- /dev/null
+++ b/src/main/java/buttondevteam/discordplugin/EventExceptionDiscordSender.java
@@ -0,0 +1,11 @@
+package buttondevteam.discordplugin;
+
+import org.bukkit.event.Event;
+
+public class EventExceptionDiscordSender implements EventExceptionHandler {
+	@Override
+	public boolean handle(Throwable ex, Event event) {
+		TBMCDiscordAPI.SendException(ex, "An error occured while executing " + event.getEventName() + "!");
+		return true;
+	}
+}
diff --git a/src/main/java/buttondevteam/discordplugin/TBMCDiscordAPI.java b/src/main/java/buttondevteam/discordplugin/TBMCDiscordAPI.java
index 550f008..9a8885b 100644
--- a/src/main/java/buttondevteam/discordplugin/TBMCDiscordAPI.java
+++ b/src/main/java/buttondevteam/discordplugin/TBMCDiscordAPI.java
@@ -7,7 +7,7 @@ import org.apache.commons.io.output.ByteArrayOutputStream;
 import org.apache.commons.lang.exception.ExceptionUtils;
 
 public final class TBMCDiscordAPI {
-	public static void SendException(Exception e, String sourcemessage) {
+	public static void SendException(Throwable e, String sourcemessage) {
 		try {
 			//System.out.println("A");
 			// ByteArrayOutputStream baos = new ByteArrayOutputStream();