diff --git a/Network/Wai/Handler/WarpTLS.hs b/Network/Wai/Handler/WarpTLS.hs
--- a/Network/Wai/Handler/WarpTLS.hs
+++ b/Network/Wai/Handler/WarpTLS.hs
@@ -25,7 +25,7 @@
 import Data.Either (rights)
 import Control.Applicative ((<$>))
 import qualified Data.PEM as PEM
-import Data.Conduit.Network (sourceSocket, sinkSocket)
+import Data.Conduit.Network (sourceSocket, sinkSocket, acceptSafe)
 import Data.Maybe (fromMaybe)
 import qualified Data.IORef as I
 import Control.Monad (unless)
@@ -56,14 +56,11 @@
             , TLS.pCertificates    = zip certs $ (Just pk):repeat Nothing
             }
 #endif
-    runSettingsConnection set (getter params sock) app
+    runSettingsConnectionMaker set (getter params sock) app
   where
-    retry :: Socket -> TLS.TLSParams -> Socket -> SomeException -> IO (Connection, SockAddr)
-    retry s a b _ = sClose s >> getter a b
-
     getter params sock = do
-        (s, sa) <- accept sock
-        handle (retry s params sock) $ do
+        (s, sa) <- acceptSafe sock
+        let mkConn = do
             (fromClient, firstBS) <- sourceSocket s C.$$+ CL.peek
             let toClient = sinkSocket s
             ifromClient <- I.newIORef fromClient
@@ -106,12 +103,13 @@
                                 sClose s
                             , connRecv = TLS.recvData ctx
                             }
-                    return (conn, sa)
+                    return conn
                 else do
                     let conn = (socketConnection s)
                             { connRecv = getNext $ fmap (fromMaybe B.empty) C.await
                             }
-                    return (conn, sa)
+                    return conn
+        return (mkConn, sa)
 
 runTLS :: TLSSettings -> Settings -> Application -> IO ()
 runTLS tset set app =
diff --git a/warp-tls.cabal b/warp-tls.cabal
--- a/warp-tls.cabal
+++ b/warp-tls.cabal
@@ -1,5 +1,5 @@
 Name:                warp-tls
-Version:             1.3.3
+Version:             1.3.4
 Synopsis:            SSL support for Warp via the TLS package
 License:             MIT
 License-file:        LICENSE
@@ -16,10 +16,10 @@
   Build-Depends:     base                          >= 4        && < 5
                    , bytestring                    >= 0.9
                    , wai                           >= 1.3      && < 1.4
-                   , warp                          >= 1.3.2    && < 1.4
+                   , warp                          >= 1.3.5    && < 1.4
                    , transformers                  >= 0.2      && < 0.4
                    , conduit                       >= 0.5      && < 0.6
-                   , network-conduit               >= 0.5      && < 0.7
+                   , network-conduit               >= 0.6      && < 0.7
                    , certificate                   >= 1.2      && < 1.4
                    , pem                           >= 0.1      && < 0.2
                    , cryptocipher                  >= 0.3      && < 0.4