diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c15babfbe1..6b2c106e5dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,5 +5,6 @@ All PRs to the Wasmer repository must add to this file.
 Blocks of changes will separated by version increments.
 
 ## **[Unreleased]**
+- [#351](https://github.com/wasmerio/wasmer/pull/351) Add hidden option to specify wasm program name (can be used to improve error messages)
 - [#350](https://github.com/wasmerio/wasmer/pull/350) Enforce that CHANGELOG.md is updated through CI.
 - [#349](https://github.com/wasmerio/wasmer/pull/349) Add [CHANGELOG.md](https://github.com/wasmerio/wasmer/blob/master/CHANGELOG.md).
diff --git a/lib/emscripten/a.txt b/lib/emscripten/a.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/lib/emscripten/foo.txt b/lib/emscripten/foo.txt
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/src/bin/wasmer.rs b/src/bin/wasmer.rs
index cc97810a98f..414099f4067 100644
--- a/src/bin/wasmer.rs
+++ b/src/bin/wasmer.rs
@@ -83,6 +83,9 @@ struct Run {
     #[structopt(long = "em-symbol-map", parse(from_os_str))]
     em_symbol_map: Option<PathBuf>,
 
+    #[structopt(long = "command-name", hidden = true)]
+    command_name: Option<String>,
+
     /// Application arguments
     #[structopt(name = "--", raw(multiple = "true"))]
     args: Vec<String>,
@@ -300,12 +303,16 @@ fn execute_wasm(options: &Run) -> Result<(), String> {
             (
                 InstanceABI::WASI,
                 wasmer_wasi::generate_import_object(
-                    [options.path.to_str().unwrap().to_owned()]
-                        .iter()
-                        .chain(options.args.iter())
-                        .cloned()
-                        .map(|arg| arg.into_bytes())
-                        .collect(),
+                    if let Some(cn) = &options.command_name {
+                        [cn.clone()]
+                    } else {
+                        [options.path.to_str().unwrap().to_owned()]
+                    }
+                    .iter()
+                    .chain(options.args.iter())
+                    .cloned()
+                    .map(|arg| arg.into_bytes())
+                    .collect(),
                     env::vars()
                         .map(|(k, v)| format!("{}={}", k, v).into_bytes())
                         .collect(),
@@ -329,7 +336,11 @@ fn execute_wasm(options: &Run) -> Result<(), String> {
         &module,
         &mut instance,
         abi,
-        options.path.to_str().unwrap(),
+        if let Some(cn) = &options.command_name {
+            cn
+        } else {
+            options.path.to_str().unwrap()
+        },
         options.args.iter().map(|arg| arg.as_str()).collect(),
     )
     .map_err(|e| format!("{:?}", e))?;