diff --git a/wsclient/src/main/java/com/google/gson/webservice/client/RequestSender.java b/wsclient/src/main/java/com/google/gson/webservice/client/RequestSender.java
index 69c8b472..b9f8d9a9 100644
--- a/wsclient/src/main/java/com/google/gson/webservice/client/RequestSender.java
+++ b/wsclient/src/main/java/com/google/gson/webservice/client/RequestSender.java
@@ -69,9 +69,7 @@ public final class RequestSender {
       String contentLength = String.valueOf(requestBodyContents.length());
       setHeader(conn, "Content-Length", contentLength, true);
       addRequestParams(conn, request.getHeaders());
-      if (requestBodyContents != null) {
-        Streams.copy(requestBodyContents, conn.getOutputStream(), false);
-      }
+      Streams.copy(requestBodyContents, conn.getOutputStream(), false);
       
       // Initiate the sending of the request.
       conn.connect();
diff --git a/wsclient/src/main/java/com/google/gson/webservice/client/RestRequestSender.java b/wsclient/src/main/java/com/google/gson/webservice/client/RestRequestSender.java
index caf3c2f1..6c432691 100644
--- a/wsclient/src/main/java/com/google/gson/webservice/client/RestRequestSender.java
+++ b/wsclient/src/main/java/com/google/gson/webservice/client/RestRequestSender.java
@@ -61,17 +61,15 @@ public final class RestRequestSender {
       R requestBody = request.getBody();
       String requestBodyContents = "";
       // Android Java VM ignore Content-Length if setDoOutput is not set
-      conn.setDoOutput(true);    
+      conn.setDoOutput(true);
       if (requestBody != null) {
         requestBodyContents = gson.toJson(requestBody);
       }
       String contentLength = String.valueOf(requestBodyContents.length());
       setHeader(conn, "Content-Length", contentLength, true);
       addRequestParams(conn, request.getHeaders());
-      if (requestBodyContents != null) {
-        Streams.copy(requestBodyContents, conn.getOutputStream(), false);
-      }
-      
+      Streams.copy(requestBodyContents, conn.getOutputStream(), false);
+
       // Initiate the sending of the request.
       conn.connect();
     } catch (IOException e) {
diff --git a/wsclient/src/main/java/com/google/gson/webservice/client/Streams.java b/wsclient/src/main/java/com/google/gson/webservice/client/Streams.java
index 3431e43d..7cc5ce79 100644
--- a/wsclient/src/main/java/com/google/gson/webservice/client/Streams.java
+++ b/wsclient/src/main/java/com/google/gson/webservice/client/Streams.java
@@ -37,8 +37,8 @@ final class Streams {
         dst.write(buf, 0, count);
       }
     } finally {
-      src.close();
-      dst.close();
+      if (closeInput) src.close();
+      if (closeOutput) dst.close();
     }
   }
 }
diff --git a/wsf/src/main/java/com/google/gson/wsf/server/WebServiceCallServerBuilder.java b/wsf/src/main/java/com/google/gson/wsf/server/WebServiceCallServerBuilder.java
index 1e9d7f3f..10f5cafa 100644
--- a/wsf/src/main/java/com/google/gson/wsf/server/WebServiceCallServerBuilder.java
+++ b/wsf/src/main/java/com/google/gson/wsf/server/WebServiceCallServerBuilder.java
@@ -21,7 +21,9 @@ import com.google.gson.webservice.definition.WebServiceResponse.Builder;
 
 public class WebServiceCallServerBuilder {
 
-  public WebServiceCallServerBuilder(WebServiceCallSpec callSpec,
-      WebServiceRequest wsRequest, Builder responseBuilder) {
+  public WebServiceCallServerBuilder(
+      @SuppressWarnings("unused") WebServiceCallSpec callSpec,
+      @SuppressWarnings("unused") WebServiceRequest wsRequest,
+      @SuppressWarnings("unused") Builder responseBuilder) {
   }
 }