lib/ur: Correct freaky error handling (fixes #6499) (#6500)

1 files changed, 10 insertions, 8 deletions

diff --git a/lib/ur/usage_report.go b/lib/ur/usage_report.go
index fa65b7307..30282d199 100644
--- a/lib/ur/usage_report.go
+++ b/lib/ur/usage_report.go
@@ -385,15 +385,17 @@ func (s *Service) sendUsageReport(ctx context.Context) error {
 		},
 	}
 	req, err := http.NewRequest("POST", s.cfg.Options().URURL, &b)
-	if err == nil {
-		req.Header.Set("Content-Type", "application/json")
-		req.Cancel = ctx.Done()
-		var resp *http.Response
-		resp, err = client.Do(req)
-		resp.Body.Close()
+	if err != nil {
+		return err
 	}
-
-	return err
+	req.Header.Set("Content-Type", "application/json")
+	req.Cancel = ctx.Done()
+	resp, err := client.Do(req)
+	if err != nil {
+		return err
+	}
+	resp.Body.Close()
+	return nil
 }
 
 func (s *Service) serve(ctx context.Context) {