diff --git a/query/src/main/java/net/md_5/bungee/query/QueryHandler.java b/query/src/main/java/net/md_5/bungee/query/QueryHandler.java
index 79d6886a..9b81197f 100644
--- a/query/src/main/java/net/md_5/bungee/query/QueryHandler.java
+++ b/query/src/main/java/net/md_5/bungee/query/QueryHandler.java
@@ -50,6 +50,17 @@ public class QueryHandler extends SimpleChannelInboundHandler<DatagramPacket>
 
     @Override
     protected void channelRead0(ChannelHandlerContext ctx, DatagramPacket msg) throws Exception
+    {
+        try
+        {
+            handleMessage( ctx, msg );
+        } catch ( Throwable t )
+        {
+            bungee.getLogger().log( Level.WARNING, "Error whilst handling query packet from " + msg.sender(), t );
+        }
+    }
+
+    private void handleMessage(ChannelHandlerContext ctx, DatagramPacket msg)
     {
         ByteBuf in = msg.content();
         if ( in.readUnsignedByte() != 0xFE || in.readUnsignedByte() != 0xFD )