diff --git a/akka-core/src/main/scala/remote/RemoteServer.scala b/akka-core/src/main/scala/remote/RemoteServer.scala
index 08c402f15a..2cd5a6dd4f 100644
--- a/akka-core/src/main/scala/remote/RemoteServer.scala
+++ b/akka-core/src/main/scala/remote/RemoteServer.scala
@@ -367,7 +367,14 @@ class RemoteServerHandler(
     val sslHandler : SslHandler = ctx.getPipeline.get(classOf[SslHandler])
  
     // Begin handshake.
-    sslHandler.handshake()
+    sslHandler.handshake().addListener( new ChannelFutureListener {
+      def operationComplete(future : ChannelFuture) : Unit = {
+        if(future.isSuccess) 
+          openChannels.add(future.getChannel)
+        else
+          future.getChannel.close
+      }
+    })
   }