diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
index 362fa6156de..65cce32c1c4 100644
--- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
+++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
@@ -214,23 +214,28 @@ public class HttpConnection implements Connection
 
                         if (!_generator.isComplete())
                         {
-                            InputStream in = _exchange.getRequestContentSource();
-                            if (in != null)
+                            if (_exchange!=null)
                             {
-                                if (_requestContentChunk == null || _requestContentChunk.length() == 0)
+                                InputStream in = _exchange.getRequestContentSource();
+                                if (in != null)
                                 {
-                                    _requestContentChunk = _exchange.getRequestContentChunk();
-                                    _destination.getHttpClient().schedule(_timeout);
+                                    if (_requestContentChunk == null || _requestContentChunk.length() == 0)
+                                    {
+                                        _requestContentChunk = _exchange.getRequestContentChunk();
+                                        _destination.getHttpClient().schedule(_timeout);
 
-                                    if (_requestContentChunk != null)
-                                        _generator.addContent(_requestContentChunk,false);
-                                    else
-                                        _generator.complete();
+                                        if (_requestContentChunk != null)
+                                            _generator.addContent(_requestContentChunk,false);
+                                        else
+                                            _generator.complete();
 
-                                    flushed = _generator.flushBuffer();
-                                    io += flushed;
+                                        flushed = _generator.flushBuffer();
+                                        io += flushed;
+                                    }
                                 }
-                            }
+                                else
+                                    _generator.complete();
+                            }                            
                             else
                                 _generator.complete();
                         }
diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java
index 37248d38a79..20b880fa2de 100644
--- a/jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java
+++ b/jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java
@@ -15,7 +15,6 @@ package org.eclipse.jetty.client;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.SocketTimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.eclipse.jetty.client.security.SecurityListener;
@@ -823,15 +822,7 @@ public class HttpExchange
         {
             try
             {
-                if (ex instanceof SocketTimeoutException ||
-                    ex.getCause() instanceof SocketTimeoutException)
-                {
-                    Log.debug(ex);
-                    setStatus(HttpExchange.STATUS_EXPIRED);
-                    HttpExchange.this.onExpire();
-                }
-                else
-                    HttpExchange.this.onException(ex);
+                HttpExchange.this.onException(ex);
             }
             finally
             {