diff --git a/lib/extension-wrapper.js b/lib/extension-wrapper.js
index 546d160..f9d2512 100644
--- a/lib/extension-wrapper.js
+++ b/lib/extension-wrapper.js
@@ -38,8 +38,13 @@ function errorToFault(err) {
     }
   };
 
-  if (err.stack)
+  if (err.stack) {
     fault.detail.stack = err.stack;
+    // Trim the stack trace
+    let stackTrimIndex = fault.detail.stack.match(/\s+at\s[^\s]+\s\(.*extension-wrapper\.js:.+\)/);
+    if (stackTrimIndex)
+      fault.detail.stack = fault.detail.stack.slice(0, stackTrimIndex.index);
+  }
 
   return fault;
 }