@@ -239,20 +239,20 @@
 	    [@"$CdEf" hexadecimalValue] == 0xCDEF &&
 	    [@"Feh" hexadecimalValue] == 0xFE &&
 	    [@"" hexadecimalValue] == 0)
 
 	EXPECT_EXCEPTION(@"Detect invalid characters in -[decimalValue] #1",
-	    OFInvalidEncodingException, [@"abc" decimalValue])
+	    OFInvalidFormatException, [@"abc" decimalValue])
 	EXPECT_EXCEPTION(@"Detect invalid characters in -[decimalValue] #2",
-	    OFInvalidEncodingException, [@"0a" decimalValue])
+	    OFInvalidFormatException, [@"0a" decimalValue])
 
 	EXPECT_EXCEPTION(@"Detect invalid chars in -[hexadecimalValue] #1",
-	    OFInvalidEncodingException, [@"0xABCDEFG" hexadecimalValue])
+	    OFInvalidFormatException, [@"0xABCDEFG" hexadecimalValue])
 	EXPECT_EXCEPTION(@"Detect invalid chars in -[hexadecimalValue] #2",
-	    OFInvalidEncodingException, [@"0x" hexadecimalValue])
+	    OFInvalidFormatException, [@"0x" hexadecimalValue])
 	EXPECT_EXCEPTION(@"Detect invalid chars in -[hexadecimalValue] #3",
-	    OFInvalidEncodingException, [@"$" hexadecimalValue])
+	    OFInvalidFormatException, [@"$" hexadecimalValue])
 
 	EXPECT_EXCEPTION(@"Detect out of range in -[decimalValue]",
 	    OFOutOfRangeException,
 	    [@"12345678901234567890123456789012345678901234567890"
 	     @"12345678901234567890123456789012345678901234567890"