diff --git a/AppKit/CPDatePicker/CPDatePicker.j b/AppKit/CPDatePicker/CPDatePicker.j
index 80b7c9efe..7f4096552 100644
--- a/AppKit/CPDatePicker/CPDatePicker.j
+++ b/AppKit/CPDatePicker/CPDatePicker.j
@@ -323,6 +323,15 @@ CPEraDatePickerElementFlag              = 0x0100;
 */
 - (void)_setDateValue:(CPDate)aDateValue timeInterval:(CPTimeInterval)aTimeInterval
 {
+    // Make sure to have a valid date and avoid NaN values
+    if (!isFinite(aDateValue))
+    {
+        [CPException raise:CPInvalidArgumentException
+                    reason:@"aDateValue is not valid"];
+        return;
+    }
+
+
     if (_minDate)
         aDateValue = new Date (MAX(aDateValue, _minDate));