@@ -1285,10 +1285,6 @@ func ServeApi(job *engine.Job) engine.Status {

 	)

 	activationLock = make(chan struct{})

-	if err := job.Eng.Register("acceptconnections", AcceptConnections); err != nil {

-		return job.Error(err)

-	}

-

 	for _, protoAddr := range protoAddrs {

 		protoAddrParts := strings.SplitN(protoAddr, "://", 2)

 		if len(protoAddrParts) != 2 {

@@ -1315,7 +1311,9 @@ func AcceptConnections(job *engine.Job) engine.Status {

 	go systemd.SdNotify("READY=1")

 	// close the lock so the listeners start accepting connections

-	close(activationLock)

+	if activationLock != nil {

+		close(activationLock)

+	}

 	return engine.StatusOK

 }

@@ -28,7 +28,10 @@ func Register(eng *engine.Engine) error {

 // remote: a RESTful api for cross-docker communication

 func remote(eng *engine.Engine) error {

-	return eng.Register("serveapi", apiserver.ServeApi)

+	if err := eng.Register("serveapi", apiserver.ServeApi); err != nil {

+		return err

+	}

+	return eng.Register("acceptconnections", apiserver.AcceptConnections)

 }

 // daemon: a default execution and storage backend for Docker on Linux,

@@ -185,7 +185,7 @@ func main() {

 		job.Setenv("TlsCa", *flCa)

 		job.Setenv("TlsCert", *flCert)

 		job.Setenv("TlsKey", *flKey)

-		job.SetenvBool("BuffferRequests", true)

+		job.SetenvBool("BufferRequests", true)

 		if err := job.Run(); err != nil {

 			log.Fatal(err)

 		}