diff --git a/crates/nu-command/src/commands/classified/external.rs b/crates/nu-command/src/commands/classified/external.rs
index c6936901d..1a648c9ea 100644
--- a/crates/nu-command/src/commands/classified/external.rs
+++ b/crates/nu-command/src/commands/classified/external.rs
@@ -31,7 +31,7 @@ pub(crate) async fn run_external_command(
     if !context.host.lock().is_external_cmd(&command.name) {
         return Err(ShellError::labeled_error(
             "Command not found",
-            "command not found",
+            format!("command {} not found", &command.name),
             &command.name_tag,
         ));
     }
diff --git a/crates/nu-engine/src/evaluate/evaluator.rs b/crates/nu-engine/src/evaluate/evaluator.rs
index cce272284..c7c323c7b 100644
--- a/crates/nu-engine/src/evaluate/evaluator.rs
+++ b/crates/nu-engine/src/evaluate/evaluator.rs
@@ -264,7 +264,7 @@ fn evaluate_reference(name: &str, ctx: &EvaluationContext, tag: Tag) -> Result<V
             Some(v) => Ok(v),
             None => Err(ShellError::labeled_error(
                 "Variable not in scope",
-                "unknown variable",
+                format!("unknown variable: {}", x),
                 tag.span,
             )),
         },
diff --git a/crates/nu-parser/tests/main.rs b/crates/nu-parser/tests/main.rs
new file mode 100644
index 000000000..2db27e58d
--- /dev/null
+++ b/crates/nu-parser/tests/main.rs
@@ -0,0 +1,25 @@
+use nu_test_support::fs::Stub::FileWithContent;
+use nu_test_support::nu;
+use nu_test_support::playground::Playground;
+
+#[test]
+fn defs_contain_comment_in_help() {
+    Playground::setup("comment_test", |dirs, sandbox| {
+        sandbox.with_files(vec![FileWithContent(
+            "my_def.nu",
+            r#"
+                # I comment and test. I am a good boy.
+                def comment_philosphy [] {
+                    echo It’s not a bug – it’s an undocumented feature. (Anonymous)
+                }
+                "#,
+        )]);
+
+        let actual = nu!(cwd: dirs.test(), r#"
+            source my_def.nu
+            help comment_philosphy
+            "#);
+
+        assert!(actual.out.contains("I comment and test. I am a good boy."));
+    });
+}