3 files changed, 3 insertions, 6 deletions
diff --git a/modules/caddyhttp/reverseproxy/streaming.go b/modules/caddyhttp/reverseproxy/streaming.go
index 3ab122c..0c8e338 100644
--- a/modules/caddyhttp/reverseproxy/streaming.go
+++ b/modules/caddyhttp/reverseproxy/streaming.go
@@ -68,7 +68,6 @@ func (h Handler) handleUpgradeResponse(rw http.ResponseWriter, req *http.Request
 	go spc.copyToBackend(errc)
 	go spc.copyFromBackend(errc)
 	<-errc
-	return
 }
 
 // flushInterval returns the p.FlushInterval value, conditionally
diff --git a/modules/caddyhttp/starlarkmw/internal/lib/module.go b/modules/caddyhttp/starlarkmw/internal/lib/module.go
index a75aedf..13c706c 100644
--- a/modules/caddyhttp/starlarkmw/internal/lib/module.go
+++ b/modules/caddyhttp/starlarkmw/internal/lib/module.go
@@ -60,7 +60,7 @@ func (r *LoadMiddleware) Run(thread *starlark.Thread, fn *starlark.Builtin, args
 
 	js := json.RawMessage(cfg.String())
 
-	if strings.Index(name, "http.handlers.") == -1 {
+	if !strings.Contains(name, "http.handlers.") {
 		name = fmt.Sprintf("http.handlers.%s", name)
 	}
 
@@ -108,7 +108,7 @@ func (r *LoadResponder) Run(thread *starlark.Thread, fn *starlark.Builtin, args
 
 	js := json.RawMessage(cfg.String())
 
-	if strings.Index(name, "http.handlers.") == -1 {
+	if !strings.Contains(name, "http.handlers.") {
 		name = fmt.Sprintf("http.handlers.%s", name)
 	}
 
diff --git a/modules/caddyhttp/templates/templates.go b/modules/caddyhttp/templates/templates.go
index adf9844..94764bf 100644
--- a/modules/caddyhttp/templates/templates.go
+++ b/modules/caddyhttp/templates/templates.go
@@ -259,9 +259,7 @@ func (t *Templates) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddy
 	// refresh, so disable them until we find a better way to do this
 	rec.Header().Del("Etag")
 
-	rec.WriteResponse()
-
-	return nil
+	return rec.WriteResponse()
 }
 
 // executeTemplate executes the template contained in wb.buf and replaces it with the results.