From 42a33c1bb869a8fd64525ae282a0ab1d859218a9 Mon Sep 17 00:00:00 2001
From: Alex Kocharin <alex@kocharin.ru>
Date: Tue, 24 Dec 2013 16:33:03 +0400
Subject: domain: don't crash on "throw null"

Signed-off-by: Trevor Norris <trev.norris@gmail.com>
---
 lib/domain.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib/domain.js')

diff --git a/lib/domain.js b/lib/domain.js
index bbedcbafcf..f18cca6eba 100644
--- a/lib/domain.js
+++ b/lib/domain.js
@@ -85,8 +85,10 @@ Domain.prototype._errorHandler = function errorHandler(er) {
   if (this._disposed)
     return true;
 
-  er.domain = this;
-  er.domainThrown = true;
+  if (!util.isPrimitive(er)) {
+    er.domain = this;
+    er.domainThrown = true;
+  }
   // wrap this in a try/catch so we don't get infinite throwing
   try {
     // One of three things will happen here.
-- 
cgit v1.2.3