diff --git a/lib/emscripten/src/emscripten_target.rs b/lib/emscripten/src/emscripten_target.rs
index d24e51df2..81444e2f9 100644
--- a/lib/emscripten/src/emscripten_target.rs
+++ b/lib/emscripten/src/emscripten_target.rs
@@ -185,6 +185,8 @@ macro_rules! invoke {
             Ok(v) => v,
             Err(_e) => {
                 get_emscripten_data($ctx).stack_restore.as_ref().expect("stack_restore is None").call(sp).expect("stack_restore call failed");
+                // TODO: We should check if _e != "longjmp" and if that's the case, re-throw the error
+                // JS version is: if (e !== e+0 && e !== 'longjmp') throw e;
                 get_emscripten_data($ctx).set_threw.as_ref().expect("set_threw is None").call(1, 0).expect("set_threw call failed");
                 0 as _
             }
@@ -199,6 +201,8 @@ macro_rules! invoke_no_return {
             Ok(v) => v,
             Err(_e) => {
                 get_emscripten_data($ctx).stack_restore.as_ref().expect("stack_restore is None").call(sp).expect("stack_restore call failed");
+                // TODO: We should check if _e != "longjmp" and if that's the case, re-throw the error
+                // JS version is: if (e !== e+0 && e !== 'longjmp') throw e;
                 get_emscripten_data($ctx).set_threw.as_ref().expect("set_threw is None").call(1, 0).expect("set_threw call failed");
             }
         }
diff --git a/lib/emscripten/src/jmp.rs b/lib/emscripten/src/jmp.rs
index 0a2ed4cab..015496d29 100644
--- a/lib/emscripten/src/jmp.rs
+++ b/lib/emscripten/src/jmp.rs
@@ -1,6 +1,6 @@
-use super::process::abort_with_message;
 use super::env::get_emscripten_data;
-use libc::{c_int};
+use super::process::abort_with_message;
+use libc::c_int;
 // use std::cell::UnsafeCell;
 use wasmer_runtime_core::vm::Ctx;
 
@@ -42,7 +42,8 @@ pub fn __longjmp(ctx: &mut Ctx, _env_addr: u32, _val: c_int) {
 }
 
 /// _longjmp
-pub fn _longjmp(ctx: &mut Ctx, env_addr: i32, val: c_int) {
+// This function differs from the js implementation, it should return Result<(), &'static str>
+pub fn _longjmp(ctx: &mut Ctx, env_addr: i32, val: c_int) -> Result<(), ()> {
     let val = if val == 0 { 1 } else { val };
     get_emscripten_data(ctx)
         .set_threw
@@ -50,7 +51,8 @@ pub fn _longjmp(ctx: &mut Ctx, env_addr: i32, val: c_int) {
         .expect("set_threw is None")
         .call(env_addr, val)
         .expect("set_threw failed to call");
-    panic!("longjmp")
+    // TODO: return Err("longjmp")
+    Err(())
 }
 
 // extern "C" {