Merge pull request #915 from notmasteryet/tree-47

Fix error object wrapper (#914)
2011-12-09 00:14:46 -08:00 · 2011-12-09 00:14:46 -08:00 · f5b9217f10
commit f5b9217f10
parent efd82ab5bd b11d1b2282
1 changed files with 2 additions and 2 deletions
--- a/src/worker.js
+++ b/src/worker.js
@ -83,8 +83,8 @@ var WorkerMessageHandler = {
      } catch (e) {
        // Turn the error into an obj that can be serialized
        e = {
-          message: e.message,
-          stack: e.stack
+          message: typeof e === 'object' ? e.message : e,
+          stack: typeof e === 'object' ? e.stack : null
        };
        handler.send('page_error', {
          pageNum: pageNum,