diff --git a/.ansible/files/ev.service b/.ansible/files/ev.service
index 97e3394..7b79e50 100644
--- a/.ansible/files/ev.service
+++ b/.ansible/files/ev.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
 [Service]
 Type=simple
 ExecStart=/usr/local/bin/ev
-
+User=www-data
 Restart=always
 RestartSec=30
 
diff --git a/app/peerfinder/service.go b/app/peerfinder/service.go
index bf554bc..a661c0c 100644
--- a/app/peerfinder/service.go
+++ b/app/peerfinder/service.go
@@ -95,7 +95,7 @@ func (s *service) Run(ctx context.Context) (err error) {
 		ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
 		defer cancel()
 
-		err = multierr.Combine(subReq.Close(ctx), subRes.Close(ctx), err)
+		err = multierr.Combine(errs, subReq.Close(ctx), subRes.Close(ctx))
 	}()
 
 	if errs != nil {