diff --git a/lib/_http_client.js b/lib/_http_client.js
index 5f873d65d18..538586e5482 100644
--- a/lib/_http_client.js
+++ b/lib/_http_client.js
@@ -264,7 +264,6 @@ function socketCloseListener() {
 
 function socketErrorListener(err) {
   var socket = this;
-  var parser = socket.parser;
   var req = socket._httpMessage;
   debug('SOCKET ERROR:', err.message, err.stack);
 
@@ -275,10 +274,18 @@ function socketErrorListener(err) {
     req.socket._hadError = true;
   }
 
+  // Handle any pending data
+  socket.read();
+
+  var parser = socket.parser;
   if (parser) {
     parser.finish();
     freeParser(parser, req, socket);
   }
+
+  // Ensure that no further data will come out of the socket
+  socket.removeListener('data', socketOnData);
+  socket.removeListener('end', socketOnEnd);
   socket.destroy();
 }
 
diff --git a/test/parallel/test-http-client-read-in-error.js b/test/parallel/test-http-client-read-in-error.js
new file mode 100644
index 00000000000..6568d7e28d0
--- /dev/null
+++ b/test/parallel/test-http-client-read-in-error.js
@@ -0,0 +1,42 @@
+var net = require('net');
+var http = require('http');
+var util = require('util');
+
+function Agent() {
+  http.Agent.call(this);
+}
+util.inherits(Agent, http.Agent);
+
+Agent.prototype.createConnection = function() {
+  var self = this;
+  var socket = new net.Socket();
+
+  socket.on('error', function() {
+    socket.push('HTTP/1.1 200\r\n\r\n');
+  });
+
+  socket.on('newListener', function onNewListener(name) {
+    if (name !== 'error')
+      return;
+    socket.removeListener('newListener', onNewListener);
+
+    // Let other listeners to be set up too
+    process.nextTick(function() {
+      self.breakSocket(socket);
+    });
+  });
+
+  return socket;
+};
+
+Agent.prototype.breakSocket = function breakSocket(socket) {
+  socket.emit('error', new Error('Intentional error'));
+};
+
+var agent = new Agent();
+
+http.request({
+  agent: agent
+}).once('error', function() {
+  console.log('ignore');
+});