diff --git a/caddyconfig/httpcaddyfile/options.go b/caddyconfig/httpcaddyfile/options.go
index e787c63e7..336c6999f 100644
--- a/caddyconfig/httpcaddyfile/options.go
+++ b/caddyconfig/httpcaddyfile/options.go
@@ -458,8 +458,6 @@ func parseOptAutoHTTPS(d *caddyfile.Dispenser, _ any) (any, error) {
 		case "disable_certs":
 		case "ignore_loaded_certs":
 		case "prefer_wildcard":
-			break
-
 		default:
 			return "", d.Errf("auto_https must be one of 'off', 'disable_redirects', 'disable_certs', 'ignore_loaded_certs', or 'prefer_wildcard'")
 		}
diff --git a/modules/caddytls/ech.go b/modules/caddytls/ech.go
index acf9de6bb..1b3bacbd2 100644
--- a/modules/caddytls/ech.go
+++ b/modules/caddytls/ech.go
@@ -1004,6 +1004,7 @@ type ECHPublisher interface {
 // PublishECHConfigListErrors is returned by ECHPublishers to describe one or more
 // errors publishing an ECH config list from PublishECHConfigList. A non-nil, empty
 // value of this type should never be returned.
+// nolint:errname // The linter wants "Error" convention, but this is a multi-error type.
 type PublishECHConfigListErrors map[string]error
 
 func (p PublishECHConfigListErrors) Error() string {