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 81fdb0bcd2..108bb1983b 100644
--- a/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java
+++ b/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java
@@ -645,13 +645,14 @@ public class SslHandler extends FrameDecoder {
             for (;;) {
                 SSLEngineResult result;
                 synchronized (handshakeLock) {
+                    boolean outboundDone = engine.isOutboundDone();
                     if (initialHandshake && !engine.getUseClientMode() &&
-                        !engine.isInboundDone() && !engine.isOutboundDone()) {
+                        !engine.isInboundDone() && !outboundDone) {
                         handshake(channel);
                         initialHandshake = false;
                     }
 
-                    if (channel.getCloseFuture().isDone()) {
+                    if (outboundDone && !channel.isConnected()) {
                         ChannelFuture handshakeFuture = this.handshakeFuture;
                         if (handshakeFuture != null &&
                             handshakeFuture.getCause() != null) {