diff --git a/Foundation/CPDecimal.j b/Foundation/CPDecimal.j
index 92382d1ce..8824a6218 100644
--- a/Foundation/CPDecimal.j
+++ b/Foundation/CPDecimal.j
@@ -142,6 +142,9 @@ function CPDecimalMakeWithString(string, locale)
     {
         // input is too long, increase exponent and truncate
         exponent += inputlength - CPDecimalMaxDigits;
+    } else if (inputlength === 0)
+    {
+        return CPDecimalMakeNaN();
     }
 
     if (exponent > CPDecimalMaxExponent || exponent < CPDecimalMinExponent)
diff --git a/Tests/Foundation/CPDecimalNumberTest.j b/Tests/Foundation/CPDecimalNumberTest.j
index 471ed91dd..7e1ea479c 100644
--- a/Tests/Foundation/CPDecimalNumberTest.j
+++ b/Tests/Foundation/CPDecimalNumberTest.j
@@ -145,20 +145,14 @@
     dcmn = [[CPDecimalNumber alloc] initWithString:@"foo"];
     [self assert:CPOrderedSame equals:[dcmn compare:[CPDecimalNumber notANumber]] message:"initWithString: 2 overflow should return NaN"];
 
-    dcmn = [[CPDecimalNumber alloc] initWithString:@".123"];
+    dcmn = [[CPDecimalNumber alloc] initWithString:@"0123"];
     [self assert:CPOrderedSame equals:[dcmn compare:[CPDecimalNumber notANumber]] message:"initWithString: 3 overflow should return NaN"];
 
-    dcmn = [[CPDecimalNumber alloc] initWithString:@"-.123"];
+    dcmn = [[CPDecimalNumber alloc] initWithString:@"1e200"];
     [self assert:CPOrderedSame equals:[dcmn compare:[CPDecimalNumber notANumber]] message:"initWithString: 4 overflow should return NaN"];
 
-    dcmn = [[CPDecimalNumber alloc] initWithString:@"0123"];
-    [self assert:CPOrderedSame equals:[dcmn compare:[CPDecimalNumber notANumber]] message:"initWithString: 5 overflow should return NaN"];
-
-    dcmn = [[CPDecimalNumber alloc] initWithString:@"1e200"];
-    [self assert:CPOrderedSame equals:[dcmn compare:[CPDecimalNumber notANumber]] message:"initWithString: 6 overflow should return NaN"];
-
     dcmn = [[CPDecimalNumber alloc] initWithString:@"12312e-23421"];
-    [self assert:CPOrderedSame equals:[dcmn compare:[CPDecimalNumber notANumber]] message:"initWithString: 7 overflow should return NaN"];
+    [self assert:CPOrderedSame equals:[dcmn compare:[CPDecimalNumber notANumber]] message:"initWithString: 5 overflow should return NaN"];
 }
 
 - (void)testAdd
diff --git a/Tests/Foundation/CPDecimalTest.j b/Tests/Foundation/CPDecimalTest.j
index 9acdfbdbb..1a8411a09 100644
--- a/Tests/Foundation/CPDecimalTest.j
+++ b/Tests/Foundation/CPDecimalTest.j
@@ -99,10 +99,6 @@
     [self assertTrue:dcm._isNaN message:"CPDecimalMakeWithString() Ti9: catch of invalid number string. Should return NaN"];
     dcm = CPDecimalMakeWithString(@"-0001");
     [self assertTrue:dcm._isNaN message:"CPDecimalMakeWithString() Ti10: catch of invalid number string. Should return NaN"];
-    dcm = CPDecimalMakeWithString(@".123");
-    [self assertTrue:dcm._isNaN message:"CPDecimalMakeWithString() Ti11: catch of invalid number string. Should return NaN"];
-    dcm = CPDecimalMakeWithString(@"-.1");
-    [self assertTrue:dcm._isNaN message:"CPDecimalMakeWithString() Ti12: catch of invalid number string. Should return NaN"];
 
     //test make with parts
     dcm = CPDecimalMakeWithParts(10127658,2);