diff --git a/crates/nu-engine/src/env.rs b/crates/nu-engine/src/env.rs
index ee4401546bb..2c4aec9fb36 100644
--- a/crates/nu-engine/src/env.rs
+++ b/crates/nu-engine/src/env.rs
@@ -220,9 +220,10 @@ pub fn current_dir(engine_state: &EngineState, stack: &Stack) -> Result<PathBuf,
     // we still need to simplify Windows paths. "." is safe because `cwd` should
     // be an absolute path already.
     canonicalize_with(&cwd, ".").map_err(|err| {
-        ShellError::Io(IoError::new(
+        ShellError::Io(IoError::new_internal_with_path(
             err.kind(),
-            Span::unknown(),
+            "Could not canonicalize current dir",
+            nu_protocol::location!(),
             PathBuf::from(cwd),
         ))
     })
@@ -239,9 +240,10 @@ pub fn current_dir_const(working_set: &StateWorkingSet) -> Result<PathBuf, Shell
     // we still need to simplify Windows paths. "." is safe because `cwd` should
     // be an absolute path already.
     canonicalize_with(&cwd, ".").map_err(|err| {
-        ShellError::Io(IoError::new(
+        ShellError::Io(IoError::new_internal_with_path(
             err.kind(),
-            Span::unknown(),
+            "Could not canonicalize current dir",
+            nu_protocol::location!(),
             PathBuf::from(cwd),
         ))
     })
diff --git a/crates/nu-plugin-core/src/communication_mode/mod.rs b/crates/nu-plugin-core/src/communication_mode/mod.rs
index 19d89363bd8..2b1ec068846 100644
--- a/crates/nu-plugin-core/src/communication_mode/mod.rs
+++ b/crates/nu-plugin-core/src/communication_mode/mod.rs
@@ -218,10 +218,10 @@ impl PreparedServerCommunication {
                                 if !is_would_block_err(&err) {
                                     // `WouldBlock` is ok, just means it's not ready yet, but some other
                                     // kind of error should be reported
-                                    return Err(ShellError::Io(IoError::new(
+                                    return Err(ShellError::Io(IoError::new_internal(
                                         err.kind(),
-                                        Span::unknown(),
-                                        None,
+                                        "Accepting new data from listener failed",
+                                        nu_protocol::location!(),
                                     )));
                                 }
                             }