5 files changed, 15 insertions, 19 deletions
diff --git a/core/benches/op_baseline.rs b/core/benches/op_baseline.rs
index 132d92f00..04b72959c 100644
--- a/core/benches/op_baseline.rs
+++ b/core/benches/op_baseline.rs
@@ -27,7 +27,6 @@ fn create_js_runtime() -> JsRuntime {
       "init",
       r#"
       Deno.core.ops();
-      Deno.core.registerErrorClass('Error', Error);
     "#,
     )
     .unwrap();
diff --git a/core/core.js b/core/core.js
index a86ece436..f90dbcc18 100644
--- a/core/core.js
+++ b/core/core.js
@@ -6,7 +6,15 @@
   const { send } = window.Deno.core;
 
   let opsCache = {};
-  const errorMap = {};
+  const errorMap = {
+    // Builtin v8 / JS errors
+    Error,
+    RangeError,
+    ReferenceError,
+    SyntaxError,
+    TypeError,
+    URIError,
+  };
   let nextPromiseId = 1;
   const promiseMap = new Map();
   const RING_SIZE = 4 * 1024;
@@ -71,28 +79,24 @@
     return send(opsCache[opName], promiseId, control, zeroCopy);
   }
 
-  function registerErrorClass(errorName, className, args) {
-    if (typeof errorMap[errorName] !== "undefined") {
-      throw new TypeError(`Error class for "${errorName}" already registered`);
+  function registerErrorClass(className, errorClass) {
+    if (typeof errorMap[className] !== "undefined") {
+      throw new TypeError(`Error class for "${className}" already registered`);
     }
-    errorMap[errorName] = [className, args ?? []];
-  }
-
-  function getErrorClassAndArgs(errorName) {
-    return errorMap[errorName] ?? [undefined, []];
+    errorMap[className] = errorClass;
   }
 
   function unwrapOpResult(res) {
     // .$err_class_name is a special key that should only exist on errors
     if (res?.$err_class_name) {
       const className = res.$err_class_name;
-      const [ErrorClass, args] = getErrorClassAndArgs(className);
+      const ErrorClass = errorMap[className];
       if (!ErrorClass) {
         throw new Error(
           `Unregistered error class: "${className}"\n  ${res.message}\n  Classes of errors returned from ops should be registered via Deno.core.registerErrorClass().`,
         );
       }
-      throw new ErrorClass(res.message, ...args);
+      throw new ErrorClass(res.message);
     }
     return res;
   }
diff --git a/core/examples/hello_world.rs b/core/examples/hello_world.rs
index 154c05d97..3a40ee29a 100644
--- a/core/examples/hello_world.rs
+++ b/core/examples/hello_world.rs
@@ -74,10 +74,6 @@ const _newline = new Uint8Array([10]);
 function print(value) {
   Deno.core.dispatchByName('op_print', 0, value.toString(), _newline);
 }
-
-// Finally we register the error class used by op_sum
-// so that it throws the correct class.
-Deno.core.registerErrorClass('Error', Error);
 "#,
     )
     .unwrap();
diff --git a/core/examples/http_bench_json_ops.js b/core/examples/http_bench_json_ops.js
index 687be7ec1..672747196 100644
--- a/core/examples/http_bench_json_ops.js
+++ b/core/examples/http_bench_json_ops.js
@@ -55,7 +55,6 @@ async function serve(rid) {
 
 async function main() {
   Deno.core.ops();
-  Deno.core.registerErrorClass("Error", Error);
 
   const listenerRid = listen();
   Deno.core.print(`http_bench_ops listening on http://127.0.0.1:4544/\n`);
diff --git a/core/ops_json.rs b/core/ops_json.rs
index d368453d9..309fac12d 100644
--- a/core/ops_json.rs
+++ b/core/ops_json.rs
@@ -122,8 +122,6 @@ mod tests {
         r#"
     // First we initialize the ops cache. This maps op names to their id's.
     Deno.core.ops();
-    // Register the error class.
-    Deno.core.registerErrorClass('Error', Error);
 
     async function f1() {
       await Deno.core.opAsync('op_throw', 'hello');