diff --git a/lib/util/utils.ts b/lib/util/utils.ts
index 18bdd1c..37e768f 100644
--- a/lib/util/utils.ts
+++ b/lib/util/utils.ts
@@ -14,21 +14,26 @@ import { Constants } from "./constants";
 export const isNode = typeof navigator === "undefined" && typeof process !== "undefined";
 
 /**
- * Converts a WithHttpOperationResponse method to a method returning only the body.
- * Supports an optional callback as the last argument.
- * @param httpOperationResponseMethod
- * @param args
+ * Adapts a WithHttpOperationResponse method to unwrap the body and accept an optional callback.
+ * @param httpOperationResponseMethod the method to call and apply a callback to
+ * @param args the arguments to the method, optionally including a trailing callback.
  */
-export function responseToBody(httpOperationResponseMethod: Function, ...args: any[]) {
-  const callback = args[args.length - 1];
+export function responseToBody(httpOperationResponseMethod: (...args: any[]) => Promise<HttpOperationResponse>, ...args: any[]): Promise<any> | undefined {
+  // The generated code will always pass (options, callback) as the last two args.
+  // But `options` could actually be the callback for the sake of user convenience.
+  let callback = args.pop();
+  if (typeof callback !== "function" && typeof args[args.length - 1] === "function") {
+    callback = args.pop();
+  }
   if (typeof callback === "function") {
-    httpOperationResponseMethod(...args.slice(0, args.length - 1))
+    httpOperationResponseMethod(...args)
       // tslint:disable-next-line:no-null-keyword
-      .then((res: HttpOperationResponse) => callback(null, res.parsedBody, res.request, res))
-      .catch((err: any) => callback(err));
+      .then(res => callback(null, res.parsedBody, res.request, res))
+      .catch(err => callback(err));
   } else {
     return httpOperationResponseMethod(...args).then((res: HttpOperationResponse) => res.parsedBody);
   }
+  return undefined; // optimized out
 }
 
 /**
diff --git a/test/shared/utilsTests.ts b/test/shared/utilsTests.ts
new file mode 100644
index 0000000..7ca7024
--- /dev/null
+++ b/test/shared/utilsTests.ts
@@ -0,0 +1,70 @@
+import * as should from "should";
+import { responseToBody, HttpOperationResponse, HttpHeaders, WebResource } from "../../lib/msRest";
+
+const response: HttpOperationResponse = { status: 200, headers: new HttpHeaders(), parsedBody: { foo: 42 }, request: new WebResource() };
+
+describe("responseToBody", function() {
+    it("should pass arguments", function() {
+        let r1 = false;
+        let r2 = 0;
+        let r3: { [key: string]: string } = {};
+        const responseMethod = (p1: boolean, p2: number, opts: {}) => {
+            r1 = p1;
+            r2 = p2;
+            r3 = opts;
+            return Promise.resolve(response);
+        };
+        responseToBody(responseMethod, true, 123, { opt: "hello" }, undefined);
+        r1.should.equal(true);
+        r2.should.equal(123);
+        r3.opt.should.equal("hello");
+    });
+
+    it("should return a promise when no callback is provided", function() {
+        const result = responseToBody(() => Promise.resolve(response));
+        result!.should.be.instanceof(Promise);
+    });
+
+    it("should call the callback in the last argument", function(done) {
+        const response: HttpOperationResponse = { status: 200, headers: new HttpHeaders(), parsedBody: { foo: 42 }, request: new WebResource() };
+        const responseMethod = () => {
+            return Promise.resolve(response);
+        };
+
+        const result = responseToBody(responseMethod, (err: any, body: any, request: WebResource, innerResponse: HttpOperationResponse) => {
+            should(err).equal(null);
+            body.foo.should.equal(42);
+            request.should.equal(response.request);
+            innerResponse.should.equal(response);
+            done();
+        });
+        should(result).equal(undefined);
+    });
+
+    it("should call the callback in the second to last argument", function(done) {
+        let response: HttpOperationResponse = { status: 200, headers: new HttpHeaders(), parsedBody: { foo: 42 }, request: new WebResource() };
+        const responseMethod = () => {
+            return Promise.resolve(response);
+        };
+
+        const result = responseToBody(responseMethod, (err: any, body: any, request: WebResource, innerResponse: HttpOperationResponse) => {
+            should(err).equal(null);
+            body.foo.should.equal(42);
+            request.should.equal(response.request);
+            innerResponse.should.equal(response);
+            done();
+        }, undefined);
+        should(result).equal(undefined);
+    });
+
+    it("should pass errors to the callback", function(done) {
+        const responseMethod = () => {
+            return Promise.reject(new Error());
+        };
+
+        responseToBody(responseMethod, (err: Error) => {
+            err.should.be.instanceof(Error);
+            done();
+        });
+    });
+});
\ No newline at end of file