diff --git a/Plugins/BridgeJS/Sources/BridgeJSTool/ExportSwift.swift b/Plugins/BridgeJS/Sources/BridgeJSTool/ExportSwift.swift
index 291c4a33..9c527700 100644
--- a/Plugins/BridgeJS/Sources/BridgeJSTool/ExportSwift.swift
+++ b/Plugins/BridgeJS/Sources/BridgeJSTool/ExportSwift.swift
@@ -523,7 +523,7 @@ class ExportSwift {
             case .i64: return "return 0"
             case .f32: return "return 0.0"
             case .f64: return "return 0.0"
-            case .pointer: return "return UnsafeMutableRawPointer(bitPattern: -1)"
+            case .pointer: return "return UnsafeMutableRawPointer(bitPattern: -1).unsafelyUnwrapped"
             case .none: return "return"
             }
         }
diff --git a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift
index 2a5ae610..2b78b96b 100644
--- a/Tests/BridgeJSRuntimeTests/ExportAPITests.swift
+++ b/Tests/BridgeJSRuntimeTests/ExportAPITests.swift
@@ -36,9 +36,18 @@ struct TestError: Error {
     let message: String
 }
 
-@JS func throwsSwiftError() throws(JSException) -> Void {
-    throw JSException(JSError(message: "TestError").jsValue)
+@JS func throwsSwiftError(shouldThrow: Bool) throws(JSException) -> Void {
+    if shouldThrow {
+        throw JSException(JSError(message: "TestError").jsValue)
+    }
 }
+@JS func throwsWithIntResult() throws(JSException) -> Int { return 1 }
+@JS func throwsWithStringResult() throws(JSException) -> String { return "Ok" }
+@JS func throwsWithBoolResult() throws(JSException) -> Bool { return true }
+@JS func throwsWithFloatResult() throws(JSException) -> Float { return 1.0 }
+@JS func throwsWithDoubleResult() throws(JSException) -> Double { return 1.0 }
+@JS func throwsWithSwiftHeapObjectResult() throws(JSException) -> Greeter { return Greeter(name: "Test") }
+@JS func throwsWithJSObjectResult() throws(JSException) -> JSObject { return JSObject() }
 
 @JS class Greeter {
     var name: String
diff --git a/Tests/BridgeJSRuntimeTests/Generated/ExportSwift.swift b/Tests/BridgeJSRuntimeTests/Generated/ExportSwift.swift
index 81202c56..88c3030f 100644
--- a/Tests/BridgeJSRuntimeTests/Generated/ExportSwift.swift
+++ b/Tests/BridgeJSRuntimeTests/Generated/ExportSwift.swift
@@ -79,9 +79,9 @@ public func _bjs_roundTripJSObject(v: Int32) -> Int32 {
 
 @_expose(wasm, "bjs_throwsSwiftError")
 @_cdecl("bjs_throwsSwiftError")
-public func _bjs_throwsSwiftError() -> Void {
+public func _bjs_throwsSwiftError(shouldThrow: Int32) -> Void {
     do {
-        try throwsSwiftError()
+        try throwsSwiftError(shouldThrow: shouldThrow == 1)
     } catch let error {
         if let error = error.thrownValue.object {
             withExtendedLifetime(error) {
@@ -97,6 +97,155 @@ public func _bjs_throwsSwiftError() -> Void {
     }
 }
 
+@_expose(wasm, "bjs_throwsWithIntResult")
+@_cdecl("bjs_throwsWithIntResult")
+public func _bjs_throwsWithIntResult() -> Int32 {
+    do {
+        let ret = try throwsWithIntResult()
+        return Int32(ret)
+    } catch let error {
+        if let error = error.thrownValue.object {
+            withExtendedLifetime(error) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        } else {
+            let jsError = JSError(message: String(describing: error))
+            withExtendedLifetime(jsError.jsObject) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        }
+        return 0
+    }
+}
+
+@_expose(wasm, "bjs_throwsWithStringResult")
+@_cdecl("bjs_throwsWithStringResult")
+public func _bjs_throwsWithStringResult() -> Void {
+    do {
+        var ret = try throwsWithStringResult()
+        return ret.withUTF8 { ptr in
+                _return_string(ptr.baseAddress, Int32(ptr.count))
+            }
+    } catch let error {
+        if let error = error.thrownValue.object {
+            withExtendedLifetime(error) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        } else {
+            let jsError = JSError(message: String(describing: error))
+            withExtendedLifetime(jsError.jsObject) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        }
+        return
+    }
+}
+
+@_expose(wasm, "bjs_throwsWithBoolResult")
+@_cdecl("bjs_throwsWithBoolResult")
+public func _bjs_throwsWithBoolResult() -> Int32 {
+    do {
+        let ret = try throwsWithBoolResult()
+        return Int32(ret ? 1 : 0)
+    } catch let error {
+        if let error = error.thrownValue.object {
+            withExtendedLifetime(error) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        } else {
+            let jsError = JSError(message: String(describing: error))
+            withExtendedLifetime(jsError.jsObject) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        }
+        return 0
+    }
+}
+
+@_expose(wasm, "bjs_throwsWithFloatResult")
+@_cdecl("bjs_throwsWithFloatResult")
+public func _bjs_throwsWithFloatResult() -> Float32 {
+    do {
+        let ret = try throwsWithFloatResult()
+        return Float32(ret)
+    } catch let error {
+        if let error = error.thrownValue.object {
+            withExtendedLifetime(error) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        } else {
+            let jsError = JSError(message: String(describing: error))
+            withExtendedLifetime(jsError.jsObject) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        }
+        return 0.0
+    }
+}
+
+@_expose(wasm, "bjs_throwsWithDoubleResult")
+@_cdecl("bjs_throwsWithDoubleResult")
+public func _bjs_throwsWithDoubleResult() -> Float64 {
+    do {
+        let ret = try throwsWithDoubleResult()
+        return Float64(ret)
+    } catch let error {
+        if let error = error.thrownValue.object {
+            withExtendedLifetime(error) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        } else {
+            let jsError = JSError(message: String(describing: error))
+            withExtendedLifetime(jsError.jsObject) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        }
+        return 0.0
+    }
+}
+
+@_expose(wasm, "bjs_throwsWithSwiftHeapObjectResult")
+@_cdecl("bjs_throwsWithSwiftHeapObjectResult")
+public func _bjs_throwsWithSwiftHeapObjectResult() -> UnsafeMutableRawPointer {
+    do {
+        let ret = try throwsWithSwiftHeapObjectResult()
+        return Unmanaged.passRetained(ret).toOpaque()
+    } catch let error {
+        if let error = error.thrownValue.object {
+            withExtendedLifetime(error) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        } else {
+            let jsError = JSError(message: String(describing: error))
+            withExtendedLifetime(jsError.jsObject) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        }
+        return UnsafeMutableRawPointer(bitPattern: -1).unsafelyUnwrapped
+    }
+}
+
+@_expose(wasm, "bjs_throwsWithJSObjectResult")
+@_cdecl("bjs_throwsWithJSObjectResult")
+public func _bjs_throwsWithJSObjectResult() -> Int32 {
+    do {
+        let ret = try throwsWithJSObjectResult()
+        return _swift_js_retain(Int32(bitPattern: ret.id))
+    } catch let error {
+        if let error = error.thrownValue.object {
+            withExtendedLifetime(error) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        } else {
+            let jsError = JSError(message: String(describing: error))
+            withExtendedLifetime(jsError.jsObject) {
+                _swift_js_throw(Int32(bitPattern: $0.id))
+            }
+        }
+        return 0
+    }
+}
+
 @_expose(wasm, "bjs_takeGreeter")
 @_cdecl("bjs_takeGreeter")
 public func _bjs_takeGreeter(g: UnsafeMutableRawPointer, nameBytes: Int32, nameLen: Int32) -> Void {
diff --git a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/ExportSwift.json b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/ExportSwift.json
index cd87f654..7a467cc3 100644
--- a/Tests/BridgeJSRuntimeTests/Generated/JavaScript/ExportSwift.json
+++ b/Tests/BridgeJSRuntimeTests/Generated/JavaScript/ExportSwift.json
@@ -257,7 +257,15 @@
       },
       "name" : "throwsSwiftError",
       "parameters" : [
+        {
+          "label" : "shouldThrow",
+          "name" : "shouldThrow",
+          "type" : {
+            "bool" : {
 
+            }
+          }
+        }
       ],
       "returnType" : {
         "void" : {
@@ -265,6 +273,118 @@
         }
       }
     },
+    {
+      "abiName" : "bjs_throwsWithIntResult",
+      "effects" : {
+        "isAsync" : false,
+        "isThrows" : true
+      },
+      "name" : "throwsWithIntResult",
+      "parameters" : [
+
+      ],
+      "returnType" : {
+        "int" : {
+
+        }
+      }
+    },
+    {
+      "abiName" : "bjs_throwsWithStringResult",
+      "effects" : {
+        "isAsync" : false,
+        "isThrows" : true
+      },
+      "name" : "throwsWithStringResult",
+      "parameters" : [
+
+      ],
+      "returnType" : {
+        "string" : {
+
+        }
+      }
+    },
+    {
+      "abiName" : "bjs_throwsWithBoolResult",
+      "effects" : {
+        "isAsync" : false,
+        "isThrows" : true
+      },
+      "name" : "throwsWithBoolResult",
+      "parameters" : [
+
+      ],
+      "returnType" : {
+        "bool" : {
+
+        }
+      }
+    },
+    {
+      "abiName" : "bjs_throwsWithFloatResult",
+      "effects" : {
+        "isAsync" : false,
+        "isThrows" : true
+      },
+      "name" : "throwsWithFloatResult",
+      "parameters" : [
+
+      ],
+      "returnType" : {
+        "float" : {
+
+        }
+      }
+    },
+    {
+      "abiName" : "bjs_throwsWithDoubleResult",
+      "effects" : {
+        "isAsync" : false,
+        "isThrows" : true
+      },
+      "name" : "throwsWithDoubleResult",
+      "parameters" : [
+
+      ],
+      "returnType" : {
+        "double" : {
+
+        }
+      }
+    },
+    {
+      "abiName" : "bjs_throwsWithSwiftHeapObjectResult",
+      "effects" : {
+        "isAsync" : false,
+        "isThrows" : true
+      },
+      "name" : "throwsWithSwiftHeapObjectResult",
+      "parameters" : [
+
+      ],
+      "returnType" : {
+        "swiftHeapObject" : {
+          "_0" : "Greeter"
+        }
+      }
+    },
+    {
+      "abiName" : "bjs_throwsWithJSObjectResult",
+      "effects" : {
+        "isAsync" : false,
+        "isThrows" : true
+      },
+      "name" : "throwsWithJSObjectResult",
+      "parameters" : [
+
+      ],
+      "returnType" : {
+        "jsObject" : {
+
+        }
+      }
+    },
     {
       "abiName" : "bjs_takeGreeter",
       "effects" : {
diff --git a/Tests/prelude.mjs b/Tests/prelude.mjs
index b46e3dcc..4a28d6aa 100644
--- a/Tests/prelude.mjs
+++ b/Tests/prelude.mjs
@@ -107,11 +107,17 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) {
     assert.equal(exports.roundTripJSObject(anyObject), anyObject);
 
     try {
-        exports.throwsSwiftError();
+        exports.throwsSwiftError(true);
         assert.fail("Expected error");
     } catch (error) {
         assert.equal(error.message, "TestError", error);
     }
+
+    try {
+        exports.throwsSwiftError(false);
+    } catch (error) {
+        assert.fail("Expected no error");
+    }
 }
 
 function setupTestGlobals(global) {