diff --git a/src/net/spdy/spdy_proxy_client_socket.cc b/src/net/spdy/spdy_proxy_client_socket.cc
index a8ae6ae9dd..95ba1b2aba 100644
--- a/src/net/spdy/spdy_proxy_client_socket.cc
+++ b/src/net/spdy/spdy_proxy_client_socket.cc
@@ -584,6 +584,10 @@ int SpdyProxyClientSocket::DoProcessResponseHeadersComplete(int result) {
 }
 
 int SpdyProxyClientSocket::DoProcessResponseCode() {
+  if (preamble_index_.has_value()) {
+    next_state_ = STATE_OPEN;
+    return OK;
+  }
   switch (response_.headers->response_code()) {
     case 200:  // OK
       next_state_ = STATE_OPEN;
@@ -595,10 +599,6 @@ int SpdyProxyClientSocket::DoProcessResponseCode() {
       return HandleProxyAuthChallenge(auth_.get(), &response_, net_log_);
 
     default:
-      if (preamble_index_.has_value()) {
-        next_state_ = STATE_OPEN;
-        return OK;
-      }
       // Ignore response to avoid letting the proxy impersonate the target
       // server.  (See http://crbug.com/137891.)
       return ERR_TUNNEL_CONNECTION_FAILED;
diff --git a/src/net/tools/naive/naive_proxy.cc b/src/net/tools/naive/naive_proxy.cc
index 21ba8b51ec..bc12811812 100644
--- a/src/net/tools/naive/naive_proxy.cc
+++ b/src/net/tools/naive/naive_proxy.cc
@@ -138,8 +138,7 @@ void NaiveProxy::OnAcceptComplete(int result) {
 
 void NaiveProxy::OnPreambleComplete(int result) {
   if (result != OK) {
-    LOG(ERROR) << "Preamble error: " << ErrorToShortString(result);
-    return;
+    LOG(WARNING) << "Preamble error: " << ErrorToShortString(result);
   }
   DoConnect();
   if (accept_loop_needs_restart_) {