diff --git a/src/net/http/server.go b/src/net/http/server.go
index 4329e61e60..b59179fb3c 100644
--- a/src/net/http/server.go
+++ b/src/net/http/server.go
@@ -3161,10 +3161,10 @@ type tcpKeepAliveListener struct {
 	*net.TCPListener
 }
 
-func (ln tcpKeepAliveListener) Accept() (c net.Conn, err error) {
+func (ln tcpKeepAliveListener) Accept() (net.Conn, error) {
 	tc, err := ln.AcceptTCP()
 	if err != nil {
-		return
+		return nil, err
 	}
 	tc.SetKeepAlive(true)
 	tc.SetKeepAlivePeriod(3 * time.Minute)