diff --git a/src/main/java/com/ning/http/client/oauth/OAuthSignatureCalculator.java b/src/main/java/com/ning/http/client/oauth/OAuthSignatureCalculator.java
index ed7213c154..9e40363d25 100644
--- a/src/main/java/com/ning/http/client/oauth/OAuthSignatureCalculator.java
+++ b/src/main/java/com/ning/http/client/oauth/OAuthSignatureCalculator.java
@@ -89,7 +89,7 @@ public void calculateAndAddSignature(String baseURL, Request request, RequestBui
         long timestamp = System.currentTimeMillis() / 1000L;
         String signature = calculateSignature(method, baseURL, timestamp, nonce, request.getParams(), request.getQueryParams());
         String headerValue = constructAuthHeader(signature, nonce, timestamp);
-        requestBuilder = requestBuilder.addHeader(HEADER_AUTHORIZATION, headerValue);
+        requestBuilder = requestBuilder.setHeader(HEADER_AUTHORIZATION, headerValue);
     }
 
     /**
diff --git a/src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProvider.java b/src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProvider.java
index 28301b9075..d115750ac8 100644
--- a/src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProvider.java
+++ b/src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProvider.java
@@ -930,6 +930,8 @@ public void messageReceived(final ChannelHandlerContext ctx, MessageEvent e) thr
                 if (chunk.isLast()) {
                     AsyncCallable ac = (AsyncCallable) ctx.getAttachment();
                     ac.call();
+                }else{
+                    return;
                 }
             } else {
                 AsyncCallable ac = (AsyncCallable) ctx.getAttachment();