diff --git a/lib/child_process.js b/lib/child_process.js
index d07d244777c..9406f9547ca 100644
--- a/lib/child_process.js
+++ b/lib/child_process.js
@@ -526,6 +526,9 @@ ChildProcess.prototype.kill = function(sig) {
   if (this._internal) {
     this.killed = true;
     var r = this._internal.kill(signal);
-    // TODO: raise error if r == -1?
+    if (r === -1) {
+      this.emit('error', errnoException(errno, 'kill'));
+      return;
+    }
   }
 };
diff --git a/test/simple/test-child-process-kill-throw.js b/test/simple/test-child-process-kill-throw.js
new file mode 100644
index 00000000000..79daa5d4c50
--- /dev/null
+++ b/test/simple/test-child-process-kill-throw.js
@@ -0,0 +1,47 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var common = require('../common');
+var assert = require('assert');
+
+if (process.argv[2] === 'child') {
+  process.exit(0);
+} else {
+  var spawn = require('child_process').spawn;
+  var child = spawn(process.execPath, [process.argv[1], 'child']);
+
+  var error = {};
+  child.on('exit', function() {
+    child._internal = {
+      kill: function() { return -1; }
+    };
+    child.once('error', function(err) {
+      error = err;
+    });
+    child.kill();
+  });
+
+  process.on('exit', function() {
+    // we shouldn't reset errno since it accturlly isn't set
+    // because of the fake .kill method
+    assert.equal(error.syscall, 'kill');
+  });
+}