diff --git a/lib/net.js b/lib/net.js
index 191ba3db37f..e677509d393 100644
--- a/lib/net.js
+++ b/lib/net.js
@@ -437,6 +437,10 @@ Socket.prototype._getpeername = function() {
   }
   if (!this._peername) {
     this._peername = this._handle.getpeername();
+    // getpeername() returns null on error
+    if (this._peername === null) {
+      return {};
+    }
   }
   return this._peername;
 };
diff --git a/test/simple/test-net-during-close.js b/test/simple/test-net-during-close.js
new file mode 100644
index 00000000000..0bcdd4d3a0b
--- /dev/null
+++ b/test/simple/test-net-during-close.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');
+var net = require('net');
+var accessedProperties = false;
+
+var server = net.createServer(function(socket) {
+  socket.end();
+});
+
+server.listen(common.PORT, function() {
+  var client = net.createConnection(common.PORT);
+  server.close();
+  // server connection event has not yet fired
+  // client is still attempting to connect
+  assert.doesNotThrow(function() {
+    client.remoteAddress;
+    client.remotePort;
+  });
+  accessedProperties = true;
+  // exit now, do not wait for the client error event
+  process.exit(0);
+});
+
+process.on('exit', function() {
+  assert(accessedProperties);
+});