diff --git a/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java b/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java
index 43bc44d000..e27357e3cf 100644
--- a/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java
+++ b/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java
@@ -1219,6 +1219,9 @@ public class SslHandler extends FrameDecoder
                     if (result.getStatus() == Status.CLOSED) {
                         sslEngineCloseFuture.setClosed();
                     }
+                    if (result.getStatus() == Status.BUFFER_OVERFLOW) {
+                        throw new SSLException("SSLEngine.unwrap() reported an impossible buffer overflow.");
+                    }
 
                     final HandshakeStatus handshakeStatus = result.getHandshakeStatus();
                     handleRenegotiation(handshakeStatus);