diff --git a/test/utility.js b/test/utility.js
index a370750a8..16b86c73c 100644
--- a/test/utility.js
+++ b/test/utility.js
@@ -37,6 +37,8 @@
   test('property', function() {
     var moe = {name : 'moe'};
     equal(_.property('name')(moe), 'moe', 'should return the property with the given name');
+    equal(_.property('name')(null), undefined, 'should return undefined for null values');
+    equal(_.property('name')(undefined), undefined, 'should return undefined for undefined values');
   });
 
   test('random', function() {
diff --git a/underscore.js b/underscore.js
index 66b4dd6d2..3939763e5 100644
--- a/underscore.js
+++ b/underscore.js
@@ -1134,7 +1134,7 @@
 
   _.property = function(key) {
     return function(obj) {
-      return obj[key];
+      return obj == null ? void 0 : obj[key];
     };
   };