diff --git a/api/handler.go b/api/handler.go
index 8a2918c7..ff06819f 100644
--- a/api/handler.go
+++ b/api/handler.go
@@ -46,7 +46,8 @@ var supportedApiVersions map[string]struct{} = map[string]struct{}{
 
 func RegisterHandlers(m manager.Manager) error {
 	http.HandleFunc(apiResource, func(w http.ResponseWriter, r *http.Request) {
-		if err := handleRequest(m, w, r); err != nil {
+		err := handleRequest(m, w, r)
+		if err != nil {
 			fmt.Fprintf(w, "%s", err)
 		}
 	})
@@ -170,7 +171,8 @@ func getContainerInfoRequest(body io.ReadCloser) (*info.ContainerInfoRequest, er
 	query.NumStats = 64
 
 	decoder := json.NewDecoder(body)
-	if err := decoder.Decode(&query); err != nil && err != io.EOF {
+	err := decoder.Decode(&query)
+	if err != nil && err != io.EOF {
 		return nil, fmt.Errorf("unable to decode the json value: %s", err)
 	}
 
diff --git a/manager/container_test.go b/manager/container_test.go
index ad838292..2166f297 100644
--- a/manager/container_test.go
+++ b/manager/container_test.go
@@ -53,7 +53,8 @@ func TestUpdateSubcontainers(t *testing.T) {
 		nil,
 	)
 
-	if err := cd.updateSubcontainers(); err != nil {
+	err := cd.updateSubcontainers()
+	if err != nil {
 		t.Fatal(err)
 	}
 
diff --git a/manager/manager.go b/manager/manager.go
index e3e62bf3..563899c7 100644
--- a/manager/manager.go
+++ b/manager/manager.go
@@ -381,7 +381,8 @@ func (self *manager) watchForNewContainers() error {
 	}
 
 	// There is a race between starting the watch and new container creation so we do a detection before we read new containers.
-	if err := self.detectSubcontainers("/"); err != nil {
+	err := self.detectSubcontainers("/")
+	if err != nil {
 		return err
 	}