diff --git a/cmd/embedded.go b/cmd/embedded.go
index 4a10465f9a57..9e252c06aadd 100644
--- a/cmd/embedded.go
+++ b/cmd/embedded.go
@@ -174,6 +174,12 @@ func runViewDo(c *cli.Context) error {
 		return err
 	}
 
+	if len(assets) == 0 {
+		return fmt.Errorf("no files matched the given pattern")
+	} else if len(assets) > 1 {
+		return fmt.Errorf("too many files matched the given pattern, try to be more specific")
+	}
+
 	data, err := assets[0].Section.AssetFS.ReadFile(assets[0].Name)
 	if err != nil {
 		return fmt.Errorf("%s: %w", assets[0].Path, err)
@@ -288,7 +294,7 @@ func buildAssetList(sec *section, globs []glob.Glob, c *cli.Context) []asset {
 	files, err := sec.AssetFS.ListFiles(".", true)
 	if err != nil {
 		log.Error("Error listing files in %q: %v", sec.Path, err)
-		return results
+		return nil
 	}
 	for _, name := range files {
 		if sec.Path == "public" &&
diff --git a/modules/templates/mailer.go b/modules/templates/mailer.go
index 633ecee42d34..dc0045beca74 100644
--- a/modules/templates/mailer.go
+++ b/modules/templates/mailer.go
@@ -68,13 +68,13 @@ func Mailer(ctx context.Context) (*texttmpl.Template, *template.Template) {
 		}
 
 		for _, assetPath := range assetPaths {
-			content, providerName, err := assetFS.ReadLayeredFile(assetPath)
+			content, layerName, err := assetFS.ReadLayeredFile(assetPath)
 			if err != nil {
-				log.Warn("Failed to read mail template %s: %v (by %s)", assetPath, err, providerName)
+				log.Warn("Failed to read mail template %s: %v (by %s)", assetPath, err, layerName)
 				continue
 			}
 			tmplName := strings.TrimPrefix(strings.TrimSuffix(assetPath, ".tmpl"), "mail/")
-			log.Debug("Adding mail template %s: %s (by %s)", tmplName, assetPath, providerName)
+			log.Debug("Adding mail template %s: %s (by %s)", tmplName, assetPath, layerName)
 			buildSubjectBodyTemplate(subjectTemplates, bodyTemplates, tmplName, content)
 		}
 	}