diff --git a/src/transport/addr_info.rs b/src/transport/addr_info.rs
index 2729965dc..8ec437915 100644
--- a/src/transport/addr_info.rs
+++ b/src/transport/addr_info.rs
@@ -77,7 +77,7 @@ mod linux {
         );
         if ret != 0 {
             let e = io::Error::last_os_error();
-            error!("failed to read SO_ORIGINAL_DST: {:?}", e);
+            warn!("failed to read SO_ORIGINAL_DST: {:?}", e);
             return Err(e);
         }
 
diff --git a/src/transport/connection.rs b/src/transport/connection.rs
index 481362380..e82ed6747 100644
--- a/src/transport/connection.rs
+++ b/src/transport/connection.rs
@@ -1,7 +1,7 @@
 /// Tokio-level (not Tower-level) proxy-specific networking.
 
 use bytes::{Buf, BytesMut};
-use futures::{*, future::Either};
+use futures::{Async, Future, IntoFuture, Poll, Stream, future::{self, Either}, stream};
 use std;
 use std::cmp;
 use std::io;
@@ -186,13 +186,15 @@ impl BoundPort {
             // background reactor if `listen_and_fold` is called before we've
             // initialized the runtime.
             TcpListener::from_std(inner, &Handle::current())
-        }).and_then(move |listener|
-            listener.incoming()
-                .take(connection_limit)
-                .and_then(move |socket| {
-                    let remote_addr = socket.peer_addr()
-                        .expect("couldn't get remote addr!");
+        }).and_then(move |mut listener| {
+            let incoming = stream::poll_fn(move || {
+                let ret = try_ready!(listener.poll_accept());
+                Ok(Async::Ready(Some(ret)))
+            });
 
+            incoming
+                .take(connection_limit)
+                .and_then(move |(socket, remote_addr)| {
                     // TODO: On Linux and most other platforms it would be better
                     // to set the `TCP_NODELAY` option on the bound socket and
                     // then have the listening sockets inherit it. However, that
@@ -225,7 +227,7 @@ impl BoundPort {
                 })
                 .filter_map(|x| x)
                 .fold(initial, f)
-        )
+        })
         .map(|_| ())
     }
 }