diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java
index ada54ce5..83ba308a 100644
--- a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java
+++ b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java
@@ -3809,6 +3809,10 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
     }
 
     public void botChat(ServerMessage message) {
+        if (message == null) {
+            return;
+        }
+
         message.retain();
 
         try {
diff --git a/src/main/java/com/eu/habbo/networking/gameserver/decoders/GameByteFrameDecoder.java b/src/main/java/com/eu/habbo/networking/gameserver/decoders/GameByteFrameDecoder.java
index 82e60ed4..67778018 100644
--- a/src/main/java/com/eu/habbo/networking/gameserver/decoders/GameByteFrameDecoder.java
+++ b/src/main/java/com/eu/habbo/networking/gameserver/decoders/GameByteFrameDecoder.java
@@ -6,7 +6,7 @@ import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
 
 public class GameByteFrameDecoder extends LengthFieldBasedFrameDecoder {
 
-    private static final int MAX_PACKET_LENGTH = 8192 * 4;
+    private static final int MAX_PACKET_LENGTH = 8192 * 16;
     private static final int LENGTH_FIELD_OFFSET = 0;
     private static final int LENGTH_FIELD_LENGTH = 4;
     private static final int LENGTH_FIELD_ADJUSTMENT = 0;