diff --git a/src/openpgp.js b/src/openpgp.js
index 9c30f17d..b01beef4 100644
--- a/src/openpgp.js
+++ b/src/openpgp.js
@@ -550,18 +550,11 @@ function execute(cmd, message) {
 function onError(message, error) {
   // log the stack trace
   if (config.debug) { console.error(error.stack); }
-  // rethrow new high level error for api users
-  const newError = new Error(message + ': ' + error.message);
 
-  // Standardize stack trace for tests
-  if (error.stack.indexOf(error.message) === -1) {
-    error.stack = 'Error: ' + error.message + '\n' + error.stack;
-  }
+  // update error message
+  error.message = message + ': ' + error.message;
 
-  //newError.innerError = error;
-  newError.stack += '\n' + error.stack;
-
-  throw newError;
+  throw error;
 }
 
 /**
diff --git a/test/general/openpgp.js b/test/general/openpgp.js
index 2cdb5c3c..6a7ecfc7 100644
--- a/test/general/openpgp.js
+++ b/test/general/openpgp.js
@@ -1202,7 +1202,8 @@ describe('OpenPGP.js public api tests', function() {
       });
 
       describe('Errors', function() {
-        it('Error stack should contain the stack of the original error', function(done) {
+
+        it('Error message should contain the original error message', function(done) {
           return openpgp.encrypt({
             data: new Uint8Array([0x01, 0x01, 0x01]),
             passwords: null
@@ -1211,23 +1212,10 @@ describe('OpenPGP.js public api tests', function() {
             done(new Error('Error expected.'));
           })
           .catch(function(error) {
-            expect(error.stack).to.match(/\nError: No keys or passwords/);
+            expect(error.message).to.match(/No keys or passwords/);
             done();
           })
         });
-        // it('Errors should contain innerError', function(done) {
-        //   openpgp.encrypt({
-        //     data: new Uint8Array([0x01, 0x01, 0x01]),
-        //     passwords: null
-        //   })
-        //   .then(function() {
-        //     done(new Error('Error expected.'));
-        //   })
-        //   .catch(function(error) {
-        //     expect(error.innerError).to.exist;
-        //     done();
-        //   });
-        // });
       });
     }