diff --git a/Bukkit-Patches/0019-Fix-Plugin-Message-API-Disconnects.patch b/Bukkit-Patches/0019-Fix-Plugin-Message-API-Disconnects.patch
new file mode 100644
index 0000000000..f83631af6b
--- /dev/null
+++ b/Bukkit-Patches/0019-Fix-Plugin-Message-API-Disconnects.patch
@@ -0,0 +1,30 @@
+From 755f74b7b1c634e6f3282b6d8ff41021ccb36d09 Mon Sep 17 00:00:00 2001
+From: md_5 <md_5@live.com.au>
+Date: Sat, 19 Oct 2013 12:59:42 +1100
+Subject: [PATCH] Fix Plugin Message API Disconnects
+
+
+diff --git a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
+index e90f2e1..e6f008c 100644
+--- a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
++++ b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
+@@ -421,7 +421,15 @@ public class StandardMessenger implements Messenger {
+         Set<PluginMessageListenerRegistration> registrations = getIncomingChannelRegistrations(channel);
+ 
+         for (PluginMessageListenerRegistration registration : registrations) {
+-            registration.getListener().onPluginMessageReceived(channel, source, message);
++            // Spigot Start
++            try
++            {
++                registration.getListener().onPluginMessageReceived( channel, source, message );
++            } catch ( Throwable t )
++            {
++                org.bukkit.Bukkit.getLogger().log( java.util.logging.Level.WARNING, "Could not pass incoming plugin message to " + registration.getPlugin(), t );
++            }
++            // Spigot End
+         }
+     }
+ 
+-- 
+1.8.3.2
+