diff --git a/apps/apps.go b/apps/apps.go
index d9db5f4..c4d0678 100644
--- a/apps/apps.go
+++ b/apps/apps.go
@@ -4,6 +4,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"io"
+	"io/ioutil"
 	"strconv"
 	"strings"
 
@@ -56,14 +58,18 @@ func New(c *deis.Client, id string) (api.App, error) {
 		}
 	}
 
-	resBody, err := c.BasicRequest("POST", "/v2/apps/", body)
-
+	res, err := c.Request("POST", "/v2/apps/", body)
 	if err != nil {
 		return api.App{}, err
 	}
+	// Fix json.Decoder bug in <go1.7
+	defer func() {
+		io.Copy(ioutil.Discard, res.Body)
+		res.Body.Close()
+	}()
 
 	app := api.App{}
-	if err = json.Unmarshal([]byte(resBody), &app); err != nil {
+	if err = json.NewDecoder(res.Body).Decode(&app); err != nil {
 		return api.App{}, err
 	}
 
@@ -77,15 +83,19 @@ func New(c *deis.Client, id string) (api.App, error) {
 func Get(c *deis.Client, appID string) (api.App, error) {
 	u := fmt.Sprintf("/v2/apps/%s/", appID)
 
-	body, err := c.BasicRequest("GET", u, nil)
-
+	res, err := c.Request("GET", u, nil)
 	if err != nil {
 		return api.App{}, err
 	}
+	// Fix json.Decoder bug in <go1.7
+	defer func() {
+		io.Copy(ioutil.Discard, res.Body)
+		res.Body.Close()
+	}()
 
 	app := api.App{}
 
-	if err = json.Unmarshal([]byte(body), &app); err != nil {
+	if err = json.NewDecoder(res.Body).Decode(&app); err != nil {
 		return api.App{}, err
 	}
 
@@ -103,15 +113,19 @@ func Logs(c *deis.Client, appID string, lines int) (string, error) {
 		u += "?log_lines=" + strconv.Itoa(lines)
 	}
 
-	body, err := c.BasicRequest("GET", u, nil)
-
-	if err != nil || len(body) < 1 {
+	res, err := c.Request("GET", u, nil)
+	if err != nil {
+		return "", ErrNoLogs
+	}
+	defer res.Body.Close()
 
+	body, err := ioutil.ReadAll(res.Body)
+	if err != nil || len(body) < 3 {
 		return "", ErrNoLogs
 	}
 
 	// We need to trim a few characters off the front and end of the string
-	return body[2 : len(body)-1], nil
+	return string(body[2 : len(body)-1]), nil
 }
 
 // Run one time command in an app.
@@ -125,26 +139,28 @@ func Run(c *deis.Client, appID string, command string) (api.AppRunResponse, erro
 
 	u := fmt.Sprintf("/v2/apps/%s/run", appID)
 
-	resBody, err := c.BasicRequest("POST", u, body)
-
+	res, err := c.Request("POST", u, body)
 	if err != nil {
 		return api.AppRunResponse{}, err
 	}
 
-	res := api.AppRunResponse{}
+	arr := api.AppRunResponse{}
 
-	if err = json.Unmarshal([]byte(resBody), &res); err != nil {
+	if err = json.NewDecoder(res.Body).Decode(&arr); err != nil {
 		return api.AppRunResponse{}, err
 	}
 
-	return res, nil
+	return arr, nil
 }
 
 // Delete an app.
 func Delete(c *deis.Client, appID string) error {
 	u := fmt.Sprintf("/v2/apps/%s/", appID)
 
-	_, err := c.BasicRequest("DELETE", u, nil)
+	res, err := c.Request("DELETE", u, nil)
+	if err == nil {
+		res.Body.Close()
+	}
 	return err
 }
 
@@ -159,6 +175,9 @@ func Transfer(c *deis.Client, appID string, username string) error {
 		return err
 	}
 
-	_, err = c.BasicRequest("POST", u, body)
+	res, err := c.Request("POST", u, body)
+	if err == nil {
+		res.Body.Close()
+	}
 	return err
 }
diff --git a/auth/auth.go b/auth/auth.go
index 52c505f..890fdf5 100644
--- a/auth/auth.go
+++ b/auth/auth.go
@@ -2,6 +2,8 @@ package auth
 
 import (
 	"encoding/json"
+	"io"
+	"io/ioutil"
 
 	deis "github.com/deis/controller-sdk-go"
 	"github.com/deis/controller-sdk-go/api"
@@ -16,7 +18,10 @@ func Register(c *deis.Client, username, password, email string) error {
 		return err
 	}
 
-	_, err = c.BasicRequest("POST", "/v2/auth/register/", body)
+	res, err := c.Request("POST", "/v2/auth/register/", body)
+	if err == nil {
+		res.Body.Close()
+	}
 	return err
 }
 
@@ -29,14 +34,18 @@ func Login(c *deis.Client, username, password string) (string, error) {
 		return "", err
 	}
 
-	body, err := c.BasicRequest("POST", "/v2/auth/login/", reqBody)
-
+	res, err := c.Request("POST", "/v2/auth/login/", reqBody)
 	if err != nil {
 		return "", err
 	}
+	// Fix json.Decoder bug in <go1.7
+	defer func() {
+		io.Copy(ioutil.Discard, res.Body)
+		res.Body.Close()
+	}()
 
 	token := api.AuthLoginResponse{}
-	if err = json.Unmarshal([]byte(body), &token); err != nil {
+	if err = json.NewDecoder(res.Body).Decode(&token); err != nil {
 		return "", err
 	}
 
@@ -57,7 +66,10 @@ func Delete(c *deis.Client, username string) error {
 		}
 	}
 
-	_, err = c.BasicRequest("DELETE", "/v2/auth/cancel/", body)
+	res, err := c.Request("DELETE", "/v2/auth/cancel/", body)
+	if err == nil {
+		res.Body.Close()
+	}
 	return err
 }
 
@@ -76,18 +88,22 @@ func Regenerate(c *deis.Client, username string, all bool) (string, error) {
 		return "", err
 	}
 
-	body, err := c.BasicRequest("POST", "/v2/auth/tokens/", reqBody)
-
+	res, err := c.Request("POST", "/v2/auth/tokens/", reqBody)
 	if err != nil {
 		return "", err
 	}
+	// Fix json.Decoder bug in <go1.7
+	defer func() {
+		io.Copy(ioutil.Discard, res.Body)
+		res.Body.Close()
+	}()
 
 	if all == true {
 		return "", nil
 	}
 
 	token := api.AuthRegenerateResponse{}
-	if err = json.Unmarshal([]byte(body), &token); err != nil {
+	if err = json.NewDecoder(res.Body).Decode(&token); err != nil {
 		return "", err
 	}
 
@@ -108,6 +124,9 @@ func Passwd(c *deis.Client, username, password, newPassword string) error {
 		return err
 	}
 
-	_, err = c.BasicRequest("POST", "/v2/auth/passwd/", body)
+	res, err := c.Request("POST", "/v2/auth/passwd/", body)
+	if err == nil {
+		res.Body.Close()
+	}
 	return err
 }
diff --git a/auth/auth_test.go b/auth/auth_test.go
index 5dc21c3..e1de803 100644
--- a/auth/auth_test.go
+++ b/auth/auth_test.go
@@ -1,6 +1,7 @@
 package auth
 
 import (
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/http"
@@ -254,7 +255,7 @@ func TestDeleteUserApp(t *testing.T) {
 	err = Delete(deis, "admin")
 	// should be a 409 Conflict
 
-	expected := fmt.Errorf("\n%s %s\n\n", "409", "Conflict")
+	expected := errors.New("409 Conflict")
 	if reflect.DeepEqual(err, expected) == false {
 		t.Errorf("got '%s' but expected '%s'", err, expected)
 	}
diff --git a/builds/builds.go b/builds/builds.go
index 0c59209..77b2535 100644
--- a/builds/builds.go
+++ b/builds/builds.go
@@ -3,6 +3,8 @@ package builds
 import (
 	"encoding/json"
 	"fmt"
+	"io"
+	"io/ioutil"
 
 	deis "github.com/deis/controller-sdk-go"
 	"github.com/deis/controller-sdk-go/api"
@@ -39,14 +41,18 @@ func New(c *deis.Client, appID string, image string,
 		return api.Build{}, err
 	}
 
-	resBody, err := c.BasicRequest("POST", u, body)
-
+	res, err := c.Request("POST", u, body)
 	if err != nil {
 		return api.Build{}, err
 	}
+	// Fix json.Decoder bug in <go1.7
+	defer func() {
+		io.Copy(ioutil.Discard, res.Body)
+		res.Body.Close()
+	}()
 
 	build := api.Build{}
-	if err = json.Unmarshal([]byte(resBody), &build); err != nil {
+	if err = json.NewDecoder(res.Body).Decode(&build); err != nil {
 		return api.Build{}, err
 	}
 
diff --git a/certs/certs.go b/certs/certs.go
index a03d01e..b16fc1a 100644
--- a/certs/certs.go
+++ b/certs/certs.go
@@ -3,6 +3,8 @@ package certs
 import (
 	"encoding/json"
 	"fmt"
+	"io"
+	"io/ioutil"
 
 	deis "github.com/deis/controller-sdk-go"
 	"github.com/deis/controller-sdk-go/api"
@@ -32,13 +34,18 @@ func New(c *deis.Client, cert string, key string, name string) (api.Cert, error)
 		return api.Cert{}, err
 	}
 
-	resBody, err := c.BasicRequest("POST", "/v2/certs/", reqBody)
+	res, err := c.Request("POST", "/v2/certs/", reqBody)
 	if err != nil {
 		return api.Cert{}, err
 	}
+	// Fix json.Decoder bug in <go1.7
+	defer func() {
+		io.Copy(ioutil.Discard, res.Body)
+		res.Body.Close()
+	}()
 
 	resCert := api.Cert{}
-	if err = json.Unmarshal([]byte(resBody), &resCert); err != nil {
+	if err = json.NewDecoder(res.Body).Decode(&resCert); err != nil {
 		return api.Cert{}, err
 	}
 
@@ -48,23 +55,31 @@ func New(c *deis.Client, cert string, key string, name string) (api.Cert, error)
 // Get information for a certificate
 func Get(c *deis.Client, name string) (api.Cert, error) {
 	url := fmt.Sprintf("/v2/certs/%s", name)
-	body, err := c.BasicRequest("GET", url, nil)
+	res, err := c.Request("GET", url, nil)
 	if err != nil {
 		return api.Cert{}, err
 	}
+	// Fix json.Decoder bug in <go1.7
+	defer func() {
+		io.Copy(ioutil.Discard, res.Body)
+		res.Body.Close()
+	}()
 
-	res := api.Cert{}
-	if err = json.Unmarshal([]byte(body), &res); err != nil {
+	resCert := api.Cert{}
+	if err = json.NewDecoder(res.Body).Decode(&resCert); err != nil {
 		return api.Cert{}, err
 	}
 
-	return res, nil
+	return resCert, nil
 }
 
 // Delete removes a cert.
 func Delete(c *deis.Client, name string) error {
 	url := fmt.Sprintf("/v2/certs/%s", name)
-	_, err := c.BasicRequest("DELETE", url, nil)
+	res, err := c.Request("DELETE", url, nil)
+	if err == nil {
+		res.Body.Close()
+	}
 	return err
 }
 
@@ -77,13 +92,19 @@ func Attach(c *deis.Client, name string, domain string) error {
 	}
 
 	url := fmt.Sprintf("/v2/certs/%s/domain/", name)
-	_, err = c.BasicRequest("POST", url, reqBody)
+	res, err := c.Request("POST", url, reqBody)
+	if err == nil {
+		res.Body.Close()
+	}
 	return err
 }
 
 // Detach a certificate from a domain
 func Detach(c *deis.Client, name string, domain string) error {
 	url := fmt.Sprintf("/v2/certs/%s/domain/%s", name, domain)
-	_, err := c.BasicRequest("DELETE", url, nil)
+	res, err := c.Request("DELETE", url, nil)
+	if err == nil {
+		res.Body.Close()
+	}
 	return err
 }
diff --git a/config/config.go b/config/config.go
index 2e19735..0ed011a 100644
--- a/config/config.go
+++ b/config/config.go
@@ -3,6 +3,8 @@ package config
 import (
 	"encoding/json"
 	"fmt"
+	"io"
+	"io/ioutil"
 
 	deis "github.com/deis/controller-sdk-go"
 	"github.com/deis/controller-sdk-go/api"
@@ -12,14 +14,18 @@ import (
 func List(c *deis.Client, app string) (api.Config, error) {
 	u := fmt.Sprintf("/v2/apps/%s/config/", app)
 
-	body, err := c.BasicRequest("GET", u, nil)
-
+	res, err := c.Request("GET", u, nil)
 	if err != nil {
 		return api.Config{}, err
 	}
+	// Fix json.Decoder bug in <go1.7
+	defer func() {
+		io.Copy(ioutil.Discard, res.Body)
+		res.Body.Close()
+	}()
 
 	config := api.Config{}
-	if err = json.Unmarshal([]byte(body), &config); err != nil {
+	if err = json.NewDecoder(res.Body).Decode(&config); err != nil {
 		return api.Config{}, err
 	}
 
@@ -36,14 +42,18 @@ func Set(c *deis.Client, app string, config api.Config) (api.Config, error) {
 
 	u := fmt.Sprintf("/v2/apps/%s/config/", app)
 
-	resBody, err := c.BasicRequest("POST", u, body)
-
+	res, err := c.Request("POST", u, body)
 	if err != nil {
 		return api.Config{}, err
 	}
+	// Fix json.Decoder bug in <go1.7
+	defer func() {
+		io.Copy(ioutil.Discard, res.Body)
+		res.Body.Close()
+	}()
 
 	newConfig := api.Config{}
-	if err = json.Unmarshal([]byte(resBody), &newConfig); err != nil {
+	if err = json.NewDecoder(res.Body).Decode(&newConfig); err != nil {
 		return api.Config{}, err
 	}
 
diff --git a/domains/domains.go b/domains/domains.go
index d7a683a..b64eafb 100644
--- a/domains/domains.go
+++ b/domains/domains.go
@@ -3,6 +3,8 @@ package domains
 import (
 	"encoding/json"
 	"fmt"
+	"io"
+	"io/ioutil"
 
 	deis "github.com/deis/controller-sdk-go"
 	"github.com/deis/controller-sdk-go/api"
@@ -37,23 +39,30 @@ func New(c *deis.Client, appID string, domain string) (api.Domain, error) {
 		return api.Domain{}, err
 	}
 
-	resBody, err := c.BasicRequest("POST", u, body)
-
+	res, err := c.Request("POST", u, body)
 	if err != nil {
 		return api.Domain{}, err
 	}
+	// Fix json.Decoder bug in <go1.7
+	defer func() {
+		io.Copy(ioutil.Discard, res.Body)
+		res.Body.Close()
+	}()
 
-	res := api.Domain{}
-	if err = json.Unmarshal([]byte(resBody), &res); err != nil {
+	d := api.Domain{}
+	if err = json.NewDecoder(res.Body).Decode(&d); err != nil {
 		return api.Domain{}, err
 	}
 
-	return res, nil
+	return d, nil
 }
 
 // Delete removes a domain from an app.
 func Delete(c *deis.Client, appID string, domain string) error {
 	u := fmt.Sprintf("/v2/apps/%s/domains/%s", appID, domain)
-	_, err := c.BasicRequest("DELETE", u, nil)
+	res, err := c.Request("DELETE", u, nil)
+	if err == nil {
+		res.Body.Close()
+	}
 	return err
 }
diff --git a/http.go b/http.go
index 4f4d244..6f1765c 100644
--- a/http.go
+++ b/http.go
@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
-	"reflect"
 	"strconv"
 	"strings"
 )
@@ -55,7 +54,7 @@ func (c *Client) Request(method string, path string, body []byte) (*http.Respons
 		return nil, err
 	}
 
-	if err = checkForErrors(res, ""); err != nil {
+	if err = checkForErrors(res); err != nil {
 		return nil, err
 	}
 
@@ -70,88 +69,48 @@ func (c *Client) Request(method string, path string, body []byte) (*http.Respons
 
 // LimitedRequest allows limiting the number of responses in a request.
 func (c *Client) LimitedRequest(path string, results int) (string, int, error) {
-	body, err := c.BasicRequest("GET", path+"?limit="+strconv.Itoa(results), nil)
+	res, err := c.Request("GET", path+"?limit="+strconv.Itoa(results), nil)
 
 	if err != nil {
 		return "", -1, err
 	}
 
-	res := make(map[string]interface{})
-	if err = json.Unmarshal([]byte(body), &res); err != nil {
-		return "", -1, err
-	}
+	defer res.Body.Close()
 
-	out, err := json.Marshal(res["results"].([]interface{}))
+	body, err := ioutil.ReadAll(res.Body)
 
 	if err != nil {
 		return "", -1, err
 	}
 
-	return string(out), int(res["count"].(float64)), nil
-}
-
-// BasicRequest makes a simple http request on the controller.
-func (c *Client) BasicRequest(method string, path string, body []byte) (string, error) {
-	res, err := c.Request(method, path, body)
-
-	if err != nil {
-		return "", err
+	r := make(map[string]interface{})
+	if err = json.Unmarshal([]byte(body), &r); err != nil {
+		return "", -1, err
 	}
-	defer res.Body.Close()
 
-	resBody, err := ioutil.ReadAll(res.Body)
+	out, err := json.Marshal(r["results"].([]interface{}))
 
 	if err != nil {
-		return "", err
+		return "", -1, err
 	}
-	return string(resBody), checkForErrors(res, string(resBody))
+
+	return string(out), int(r["count"].(float64)), nil
 }
 
-func checkForErrors(res *http.Response, body string) error {
+func checkForErrors(res *http.Response) error {
 
 	// If response is not an error, return nil.
 	if res.StatusCode > 199 && res.StatusCode < 400 {
 		return nil
 	}
 
-	// Read the response body if none was provided.
-	if body == "" {
-		defer res.Body.Close()
-		resBody, err := ioutil.ReadAll(res.Body)
-		if err != nil {
-			return err
-		}
-		body = string(resBody)
-	}
-
-	// Unmarshal the response as JSON, or return the status and body.
-	bodyMap := make(map[string]interface{})
-	if err := json.Unmarshal([]byte(body), &bodyMap); err != nil {
-		return fmt.Errorf("\n%s\n%s\n", res.Status, body)
-	}
-
-	errorMessage := fmt.Sprintf("\n%s\n", res.Status)
-	for key, value := range bodyMap {
-		switch v := value.(type) {
-		case string:
-			errorMessage += fmt.Sprintf("%s: %s\n", key, v)
-		case []interface{}:
-			for _, subValue := range v {
-				switch sv := subValue.(type) {
-				case string:
-					errorMessage += fmt.Sprintf("%s: %s\n", key, sv)
-				default:
-					fmt.Printf("Unexpected type in %s error message array. Contents: %v",
-						reflect.TypeOf(value), sv)
-				}
-			}
-		default:
-			fmt.Printf("Cannot handle key %s in error message, type %s. Contents: %v",
-				key, reflect.TypeOf(value), bodyMap[key])
-		}
-	}
+	// TEMPORARY: Close body because methods won't close it (for now) because
+	// they can't tell the difference between an HTTP error and a bad status code
+	// (which has a body to close)
+	res.Body.Close()
 
-	return errors.New(errorMessage)
+	//TODO: Implement better error system!
+	return errors.New(res.Status)
 }
 
 // CheckConnection checks that the user is connected to a network and the URL points to a valid controller.
diff --git a/http_test.go b/http_test.go
index f38a0ac..69feaa5 100644
--- a/http_test.go
+++ b/http_test.go
@@ -51,7 +51,7 @@ func (f fakeHTTPServer) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 		return
 	}
 
-	if req.URL.Path == "/basic/" && req.Method == "POST" {
+	if req.URL.Path == "/request/" && req.Method == "POST" {
 		eT := "token abc"
 		if req.Header.Get("Authorization") != eT {
 			fmt.Printf("Token Wrong: Expected %s, Got %s\n", eT, req.Header.Get("Authorization"))
@@ -84,7 +84,7 @@ func (f fakeHTTPServer) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 			return
 		}
 
-		res.Write([]byte("basic"))
+		res.Write([]byte("request"))
 		return
 	}
 
@@ -146,15 +146,16 @@ func TestBasicRequest(t *testing.T) {
 	}
 	deis.UserAgent = "test"
 
-	body, err := deis.BasicRequest("POST", "/basic/", []byte("test"))
-
+	res, err := deis.Request("POST", "/request/", []byte("test"))
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer res.Body.Close()
+	body, _ := ioutil.ReadAll(res.Body)
 
-	expected := "basic"
-	if body != expected {
-		t.Errorf("Expected %s, Got %s", expected, body)
+	expected := "request"
+	if string(body) != expected {
+		t.Errorf("Expected %s, Got %s", expected, string(body))
 	}
 
 	if deis.ControllerAPIVersion != handler.Version {
@@ -167,73 +168,6 @@ func TestBasicRequest(t *testing.T) {
 	}
 }
 
-func TestCheckErrors(t *testing.T) {
-	t.Parallel()
-
-	expected := `
-404 NOT FOUND
-error: This is an error.
-error_array: This is an array.
-error_array: Foo!
-`
-	altExpected := `
-404 NOT FOUND
-error_array: This is an array.
-error_array: Foo!
-error: This is an error.
-`
-
-	body := `
-{
-	"error": "This is an error.",
-	"error_array": [
-		"This is an array.",
-		"Foo!"
-	]
-}`
-
-	res := http.Response{
-		StatusCode: 404,
-		Status:     "404 NOT FOUND",
-	}
-
-	actual := checkForErrors(&res, body).Error()
-
-	if actual != expected && actual != altExpected {
-		t.Errorf("Expected %s or %s, Got %s", expected, altExpected, actual)
-	}
-
-	expected = `
-503 Service Temporarily Unavailable
-<html>
-<head><title>503 Service Temporarily Unavailable</title></head>
-<body bgcolor="white">
-<center><h1>503 Service Temporarily Unavailable</h1></center>
-<hr><center>nginx/1.9.4</center>
-</body>
-</html>
-`
-
-	body = `<html>
-<head><title>503 Service Temporarily Unavailable</title></head>
-<body bgcolor="white">
-<center><h1>503 Service Temporarily Unavailable</h1></center>
-<hr><center>nginx/1.9.4</center>
-</body>
-</html>`
-
-	res = http.Response{
-		StatusCode: http.StatusServiceUnavailable,
-		Status:     "503 Service Temporarily Unavailable",
-	}
-
-	actual = checkForErrors(&res, body).Error()
-
-	if actual != expected {
-		t.Errorf("Expected %s, Got %s", expected, actual)
-	}
-}
-
 func TestCheckErrorsReturnsNil(t *testing.T) {
 	t.Parallel()
 
@@ -250,7 +184,7 @@ func TestCheckErrorsReturnsNil(t *testing.T) {
 	}
 
 	for _, res := range responses {
-		if err := checkForErrors(&res, ""); err != nil {
+		if err := checkForErrors(&res); err != nil {
 			t.Fatal(err)
 		}
 	}
diff --git a/keys/keys.go b/keys/keys.go
index 8e7ce7f..a7dc429 100644
--- a/keys/keys.go
+++ b/keys/keys.go
@@ -3,6 +3,8 @@ package keys
 import (
 	"encoding/json"
 	"fmt"
+	"io"
+	"io/ioutil"
 
 	deis "github.com/deis/controller-sdk-go"
 	"github.com/deis/controller-sdk-go/api"
@@ -29,14 +31,18 @@ func New(c *deis.Client, id string, pubKey string) (api.Key, error) {
 	req := api.KeyCreateRequest{ID: id, Public: pubKey}
 	body, err := json.Marshal(req)
 
-	resBody, err := c.BasicRequest("POST", "/v2/keys/", body)
-
+	res, err := c.Request("POST", "/v2/keys/", body)
 	if err != nil {
 		return api.Key{}, err
 	}
+	// Fix json.Decoder bug in <go1.7
+	defer func() {
+		io.Copy(ioutil.Discard, res.Body)
+		res.Body.Close()
+	}()
 
 	key := api.Key{}
-	if err = json.Unmarshal([]byte(resBody), &key); err != nil {
+	if err = json.NewDecoder(res.Body).Decode(&key); err != nil {
 		return api.Key{}, err
 	}
 
@@ -47,6 +53,9 @@ func New(c *deis.Client, id string, pubKey string) (api.Key, error) {
 func Delete(c *deis.Client, keyID string) error {
 	u := fmt.Sprintf("/v2/keys/%s", keyID)
 
-	_, err := c.BasicRequest("DELETE", u, nil)
+	res, err := c.Request("DELETE", u, nil)
+	if err == nil {
+		res.Body.Close()
+	}
 	return err
 }
diff --git a/perms/perms.go b/perms/perms.go
index 05d8d28..33a8388 100644
--- a/perms/perms.go
+++ b/perms/perms.go
@@ -3,6 +3,8 @@ package perms
 import (
 	"encoding/json"
 	"fmt"
+	"io"
+	"io/ioutil"
 
 	deis "github.com/deis/controller-sdk-go"
 	"github.com/deis/controller-sdk-go/api"
@@ -10,14 +12,18 @@ import (
 
 // List users that can access an app.
 func List(c *deis.Client, appID string) ([]string, error) {
-	body, err := c.BasicRequest("GET", fmt.Sprintf("/v2/apps/%s/perms/", appID), nil)
-
+	res, err := c.Request("GET", fmt.Sprintf("/v2/apps/%s/perms/", appID), nil)
 	if err != nil {
 		return []string{}, err
 	}
+	// Fix json.Decoder bug in <go1.7
+	defer func() {
+		io.Copy(ioutil.Discard, res.Body)
+		res.Body.Close()
+	}()
 
 	var users api.PermsAppResponse
-	if err = json.Unmarshal([]byte(body), &users); err != nil {
+	if err = json.NewDecoder(res.Body).Decode(&users); err != nil {
 		return []string{}, err
 	}
 
@@ -65,13 +71,12 @@ func doNew(c *deis.Client, u string, username string) error {
 		return err
 	}
 
-	_, err = c.BasicRequest("POST", u, reqBody)
-
-	if err != nil {
-		return err
+	res, err := c.Request("POST", u, reqBody)
+	if err == nil {
+		res.Body.Close()
 	}
 
-	return nil
+	return err
 }
 
 // Delete removes a user from an app.
@@ -85,6 +90,9 @@ func DeleteAdmin(c *deis.Client, username string) error {
 }
 
 func doDelete(c *deis.Client, u string) error {
-	_, err := c.BasicRequest("DELETE", u, nil)
+	res, err := c.Request("DELETE", u, nil)
+	if err == nil {
+		res.Body.Close()
+	}
 	return err
 }
diff --git a/ps/ps.go b/ps/ps.go
index 8b38d48..cd95d84 100644
--- a/ps/ps.go
+++ b/ps/ps.go
@@ -3,6 +3,8 @@ package ps
 import (
 	"encoding/json"
 	"fmt"
+	"io"
+	"io/ioutil"
 
 	deis "github.com/deis/controller-sdk-go"
 	"github.com/deis/controller-sdk-go/api"
@@ -34,7 +36,10 @@ func Scale(c *deis.Client, appID string, targets map[string]int) error {
 		return err
 	}
 
-	_, err = c.BasicRequest("POST", u, body)
+	res, err := c.Request("POST", u, body)
+	if err == nil {
+		return res.Body.Close()
+	}
 	return err
 }
 
@@ -52,14 +57,18 @@ func Restart(c *deis.Client, appID string, procType string, name string) ([]api.
 		}
 	}
 
-	body, err := c.BasicRequest("POST", u, nil)
-
+	res, err := c.Request("POST", u, nil)
 	if err != nil {
 		return []api.Pods{}, err
 	}
+	// Fix json.Decoder bug in <go1.7
+	defer func() {
+		io.Copy(ioutil.Discard, res.Body)
+		res.Body.Close()
+	}()
 
 	procs := []api.Pods{}
-	if err = json.Unmarshal([]byte(body), &procs); err != nil {
+	if err = json.NewDecoder(res.Body).Decode(&procs); err != nil {
 		return []api.Pods{}, err
 	}
 
diff --git a/releases/releases.go b/releases/releases.go
index 93dd4e6..3369679 100644
--- a/releases/releases.go
+++ b/releases/releases.go
@@ -3,6 +3,8 @@ package releases
 import (
 	"encoding/json"
 	"fmt"
+	"io"
+	"io/ioutil"
 
 	deis "github.com/deis/controller-sdk-go"
 	"github.com/deis/controller-sdk-go/api"
@@ -30,14 +32,18 @@ func List(c *deis.Client, appID string, results int) ([]api.Release, int, error)
 func Get(c *deis.Client, appID string, version int) (api.Release, error) {
 	u := fmt.Sprintf("/v2/apps/%s/releases/v%d/", appID, version)
 
-	body, err := c.BasicRequest("GET", u, nil)
-
+	res, err := c.Request("GET", u, nil)
 	if err != nil {
 		return api.Release{}, err
 	}
+	// Fix json.Decoder bug in <go1.7
+	defer func() {
+		io.Copy(ioutil.Discard, res.Body)
+		res.Body.Close()
+	}()
 
 	release := api.Release{}
-	if err = json.Unmarshal([]byte(body), &release); err != nil {
+	if err = json.NewDecoder(res.Body).Decode(&release); err != nil {
 		return api.Release{}, err
 	}
 
@@ -60,15 +66,19 @@ func Rollback(c *deis.Client, appID string, version int) (int, error) {
 		}
 	}
 
-	body, err := c.BasicRequest("POST", u, reqBody)
-
+	res, err := c.Request("POST", u, reqBody)
 	if err != nil {
 		return -1, err
 	}
+	// Fix json.Decoder bug in <go1.7
+	defer func() {
+		io.Copy(ioutil.Discard, res.Body)
+		res.Body.Close()
+	}()
 
 	response := api.ReleaseRollback{}
 
-	if err = json.Unmarshal([]byte(body), &response); err != nil {
+	if err = json.NewDecoder(res.Body).Decode(&response); err != nil {
 		return -1, err
 	}