diff --git a/pkg/agent/run.go b/pkg/agent/run.go
index 6926d5e13..b6267be56 100644
--- a/pkg/agent/run.go
+++ b/pkg/agent/run.go
@@ -92,7 +92,7 @@ func blockingCallLLM(ctx context.Context, agent *Agent, req *llm.ChatCompletionR
 	if sErr != nil {
 		return nil, err // return the original error
 	}
-	defer stream.Close()
+	defer func() { _ = stream.Close() }()
 
 	acc := llm.NewStreamAccumulator(stream)
 	for acc.Next() {
@@ -447,8 +447,6 @@ func coreLoop(ctx context.Context, startAgent *Agent, inputMessages []llm.Messag
 				)
 				continue
 			}
-			emptyOutputRetries = 0
-
 			if err := runOutputGuardrails(ctx, s.agent, resp.Message); err != nil {
 				return s.finishRun(ctx, nil, err)
 			}
diff --git a/pkg/agent/tools/browser/download_pdf.go b/pkg/agent/tools/browser/download_pdf.go
index b48fbc07e..01d72b21a 100644
--- a/pkg/agent/tools/browser/download_pdf.go
+++ b/pkg/agent/tools/browser/download_pdf.go
@@ -95,7 +95,7 @@ func DownloadPDFTool() agent.Tool {
 					ErrorDetail: fmt.Sprintf("cannot create temp dir: %s", err),
 				}), nil
 			}
-			defer os.RemoveAll(tmpDir)
+			defer func() { _ = os.RemoveAll(tmpDir) }()
 
 			tmpFile := filepath.Join(tmpDir, "input.pdf")
 			if err := os.WriteFile(tmpFile, body, 0o600); err != nil {
diff --git a/pkg/agent/tools/browser/fetch_sitemap.go b/pkg/agent/tools/browser/fetch_sitemap.go
index 3fd006030..8e3c49793 100644
--- a/pkg/agent/tools/browser/fetch_sitemap.go
+++ b/pkg/agent/tools/browser/fetch_sitemap.go
@@ -92,7 +92,7 @@ func FetchSitemapTool() agent.Tool {
 						ErrorDetail: fmt.Sprintf("cannot decompress gzipped sitemap: %s", err),
 					}), nil
 				}
-				defer gz.Close()
+				defer func() { _ = gz.Close() }()
 				reader = gz
 			}
 
diff --git a/pkg/agent/tools/security/whois.go b/pkg/agent/tools/security/whois.go
index 2edbf2fc7..4c5882f85 100644
--- a/pkg/agent/tools/security/whois.go
+++ b/pkg/agent/tools/security/whois.go
@@ -130,7 +130,7 @@ func queryWhois(ctx context.Context, server, domain string) (string, error) {
 	if err != nil {
 		return "", fmt.Errorf("cannot connect to %s: %w", server, err)
 	}
-	defer conn.Close()
+	defer func() { _ = conn.Close() }()
 
 	_ = conn.SetDeadline(time.Now().Add(10 * time.Second))