diff --git a/api/client/attach.go b/api/client/attach.go
index 77947a2941..ef2b4ad122 100644
--- a/api/client/attach.go
+++ b/api/client/attach.go
@@ -80,7 +80,7 @@ func (cli *DockerCli) CmdAttach(args ...string) error {
 		return err
 	}
 	if status != 0 {
-		return &StatusError{StatusCode: status}
+		return StatusError{StatusCode: status}
 	}
 
 	return nil
diff --git a/api/client/build.go b/api/client/build.go
index dc54c22ffa..98f7864b02 100644
--- a/api/client/build.go
+++ b/api/client/build.go
@@ -302,7 +302,7 @@ func (cli *DockerCli) CmdBuild(args ...string) error {
 		if jerr.Code == 0 {
 			jerr.Code = 1
 		}
-		return &StatusError{Status: jerr.Message, StatusCode: jerr.Code}
+		return StatusError{Status: jerr.Message, StatusCode: jerr.Code}
 	}
 	return err
 }
diff --git a/api/client/client.go b/api/client/client.go
index c849fa40f6..3170881744 100644
--- a/api/client/client.go
+++ b/api/client/client.go
@@ -12,6 +12,6 @@ type StatusError struct {
 	StatusCode int
 }
 
-func (e *StatusError) Error() string {
+func (e StatusError) Error() string {
 	return fmt.Sprintf("Status: %s, Code: %d", e.Status, e.StatusCode)
 }
diff --git a/api/client/exec.go b/api/client/exec.go
index 25b7a85fd2..23545ae9bf 100644
--- a/api/client/exec.go
+++ b/api/client/exec.go
@@ -20,7 +20,7 @@ func (cli *DockerCli) CmdExec(args ...string) error {
 	execConfig, err := runconfig.ParseExec(cmd, args)
 	// just in case the ParseExec does not exit
 	if execConfig.Container == "" || err != nil {
-		return &StatusError{StatusCode: 1}
+		return StatusError{StatusCode: 1}
 	}
 
 	stream, _, err := cli.call("POST", "/containers/"+execConfig.Container+"/exec", execConfig, nil)
@@ -121,7 +121,7 @@ func (cli *DockerCli) CmdExec(args ...string) error {
 	}
 
 	if status != 0 {
-		return &StatusError{StatusCode: status}
+		return StatusError{StatusCode: status}
 	}
 
 	return nil
diff --git a/api/client/inspect.go b/api/client/inspect.go
index 8514b1ecbc..f993030f9a 100644
--- a/api/client/inspect.go
+++ b/api/client/inspect.go
@@ -26,7 +26,7 @@ func (cli *DockerCli) CmdInspect(args ...string) error {
 		var err error
 		if tmpl, err = template.New("").Funcs(funcMap).Parse(*tmplStr); err != nil {
 			fmt.Fprintf(cli.err, "Template parsing error: %v\n", err)
-			return &StatusError{StatusCode: 64,
+			return StatusError{StatusCode: 64,
 				Status: "Template parsing error: " + err.Error()}
 		}
 	}
@@ -85,7 +85,7 @@ func (cli *DockerCli) CmdInspect(args ...string) error {
 	}
 
 	if status != 0 {
-		return &StatusError{StatusCode: status}
+		return StatusError{StatusCode: status}
 	}
 	return nil
 }
diff --git a/api/client/run.go b/api/client/run.go
index b37b6bab29..74c656af3d 100644
--- a/api/client/run.go
+++ b/api/client/run.go
@@ -241,7 +241,7 @@ func (cli *DockerCli) CmdRun(args ...string) error {
 		}
 	}
 	if status != 0 {
-		return &StatusError{StatusCode: status}
+		return StatusError{StatusCode: status}
 	}
 	return nil
 }
diff --git a/api/client/start.go b/api/client/start.go
index a03b8c1d29..d3dec9489d 100644
--- a/api/client/start.go
+++ b/api/client/start.go
@@ -155,7 +155,7 @@ func (cli *DockerCli) CmdStart(args ...string) error {
 			return err
 		}
 		if status != 0 {
-			return &StatusError{StatusCode: status}
+			return StatusError{StatusCode: status}
 		}
 	}
 	return nil
diff --git a/docker/docker.go b/docker/docker.go
index cf5b715598..d2d4986aca 100644
--- a/docker/docker.go
+++ b/docker/docker.go
@@ -135,7 +135,7 @@ func main() {
 	}
 
 	if err := cli.Cmd(flag.Args()...); err != nil {
-		if sterr, ok := err.(*client.StatusError); ok {
+		if sterr, ok := err.(client.StatusError); ok {
 			if sterr.Status != "" {
 				logrus.Println(sterr.Status)
 			}