2 files changed, 5 insertions, 2 deletions
diff --git a/swarm/api/http/server.go b/swarm/api/http/server.go
index b4032839a..0b4ec7e18 100644
--- a/swarm/api/http/server.go
+++ b/swarm/api/http/server.go
@@ -224,7 +224,7 @@ func (s *Server) handleMultipartUpload(req *Request, boundary string, mw *api.Ma
 			if err != nil {
 				return fmt.Errorf("error copying multipart content: %s", err)
 			}
-			if _, err := tmp.Seek(0, os.SEEK_SET); err != nil {
+			if _, err := tmp.Seek(0, io.SeekStart); err != nil {
 				return fmt.Errorf("error copying multipart content: %s", err)
 			}
 			reader = tmp
diff --git a/swarm/api/http/server_test.go b/swarm/api/http/server_test.go
index 14abd1df4..d3374594b 100644
--- a/swarm/api/http/server_test.go
+++ b/swarm/api/http/server_test.go
@@ -97,7 +97,7 @@ func TestBzzrGetPath(t *testing.T) {
 					isexpectedfailrequest = true
 				}
 			}
-			if isexpectedfailrequest == false {
+			if !isexpectedfailrequest {
 				t.Fatalf("Response body does not match, expected: %v, got %v", testmanifest[v], string(respbody))
 			}
 		}
@@ -126,6 +126,9 @@ func TestBzzrGetPath(t *testing.T) {
 		}
 		defer resp.Body.Close()
 		respbody, err = ioutil.ReadAll(resp.Body)
+		if err != nil {
+			t.Fatalf("ReadAll failed: %v", err)
+		}
 		if string(respbody) != nonhashresponses[i] {
 			t.Fatalf("Non-Hash response body does not match, expected: %v, got: %v", nonhashresponses[i], string(respbody))
 		}