diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java
index 0045b1f6cd..1e6cdc14ae 100644
--- a/src/main/java/net/minecraft/server/Packet.java
+++ b/src/main/java/net/minecraft/server/Packet.java
@@ -6,6 +6,10 @@ import java.io.EOFException;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+// Craftbukkit start
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
+// Craftbukkit end
 
 public abstract class Packet {
 
@@ -86,6 +90,16 @@ public abstract class Packet {
             return null;
         }
 
+        // Craftbukkit start
+        catch (SocketTimeoutException exception) {
+            System.out.println("Read timed out");
+            return null;
+        } catch (SocketException exception) {
+            System.out.println("Connection reset");
+            return null;
+        }
+        // Craftbukkit end
+
         PacketCounter packetcounter = (PacketCounter) c.get(Integer.valueOf(i));
 
         if (packetcounter == null) {