diff --git a/Foundation/CPSet/CPSet.j b/Foundation/CPSet/CPSet.j
index 1ae1fa5bc..7a0844de9 100644
--- a/Foundation/CPSet/CPSet.j
+++ b/Foundation/CPSet/CPSet.j
@@ -424,9 +424,7 @@ var CPSetObjectsKey = @"CPSetObjectsKey";
     {
         var value = [object valueForKey:aKey];
 
-        // addObject: should be smart enough not to add these, but just in case...
-        if (value !== nil && value !== undefined)
-            [valueSet addObject:value];
+        [valueSet addObject:value];
     }
 
     return valueSet;
diff --git a/Foundation/CPSet/_CPConcreteMutableSet.j b/Foundation/CPSet/_CPConcreteMutableSet.j
index c3fba816c..299c093cd 100644
--- a/Foundation/CPSet/_CPConcreteMutableSet.j
+++ b/Foundation/CPSet/_CPConcreteMutableSet.j
@@ -85,7 +85,7 @@ var hasOwnProperty = Object.prototype.hasOwnProperty;
 - (void)addObject:(id)anObject
 {
     if (anObject === nil || anObject === undefined)
-        return;
+        [CPException raise:CPInvalidArgumentException reason:@"attempt to insert nil or undefined"];
 
     if ([self containsObject:anObject])
         return;