@@ -448,12 +448,12 @@
 	    (s[0] = [OFMutableString stringWithString: @"𝄞öööbä€"]) &&
 	    R([s[0] insertString: @"äöü"
 			 atIndex: 3]) &&
 	    [s[0] isEqual: @"𝄞ööäöüöbä€"])
 
-	EXPECT_EXCEPTION(@"Detect invalid encoding in -[stringByURLDecoding] "
-	    @"#1", OFInvalidEncodingException, [@"foo%bar" stringByURLDecoding])
+	EXPECT_EXCEPTION(@"Detect invalid format in -[stringByURLDecoding] "
+	    @"#1", OFInvalidFormatException, [@"foo%xbar" stringByURLDecoding])
 	EXPECT_EXCEPTION(@"Detect invalid encoding in -[stringByURLDecoding] "
 	    @"#2", OFInvalidEncodingException,
 	    [@"foo%FFbar" stringByURLDecoding])
 
 	TEST(@"-[setCharacter:atIndex:]",
@@ -560,21 +560,21 @@
 	    [[@"ä" stringByXMLUnescaping] isEqual: @"ä"] &&
 	    [[@"€" stringByXMLUnescaping] isEqual: @"€"] &&
 	    [[@"𝄞" stringByXMLUnescaping] isEqual: @"𝄞"])
 
 	EXPECT_EXCEPTION(@"Detect invalid entities in -[stringByXMLUnescaping] "
-	    @"#1", OFInvalidEncodingException, [@"&foo;" stringByXMLUnescaping])
-	EXPECT_EXCEPTION(@"Detect invalid entities in -[stringByXMLUnescaping] "
-	    @"#2", OFInvalidEncodingException, [@"x&amp" stringByXMLUnescaping])
-	EXPECT_EXCEPTION(@"Detect invalid entities in -[stringByXMLUnescaping] "
-	    @"#3", OFInvalidEncodingException, [@"&#;" stringByXMLUnescaping])
-	EXPECT_EXCEPTION(@"Detect invalid entities in -[stringByXMLUnescaping] "
-	    @"#4", OFInvalidEncodingException, [@"&#x;" stringByXMLUnescaping])
-	EXPECT_EXCEPTION(@"Detect invalid entities in -[stringByXMLUnescaping] "
-	    @"#5", OFInvalidEncodingException, [@"&#g;" stringByXMLUnescaping])
-	EXPECT_EXCEPTION(@"Detect invalid entities in -[stringByXMLUnescaping] "
-	    @"#6", OFInvalidEncodingException, [@"&#xg;" stringByXMLUnescaping])
+	    @"#1", OFInvalidFormatException, [@"&foo;" stringByXMLUnescaping])
+	EXPECT_EXCEPTION(@"Detect invalid entities in -[stringByXMLUnescaping] "
+	    @"#2", OFInvalidFormatException, [@"x&amp" stringByXMLUnescaping])
+	EXPECT_EXCEPTION(@"Detect invalid entities in -[stringByXMLUnescaping] "
+	    @"#3", OFInvalidFormatException, [@"&#;" stringByXMLUnescaping])
+	EXPECT_EXCEPTION(@"Detect invalid entities in -[stringByXMLUnescaping] "
+	    @"#4", OFInvalidFormatException, [@"&#x;" stringByXMLUnescaping])
+	EXPECT_EXCEPTION(@"Detect invalid entities in -[stringByXMLUnescaping] "
+	    @"#5", OFInvalidFormatException, [@"&#g;" stringByXMLUnescaping])
+	EXPECT_EXCEPTION(@"Detect invalid entities in -[stringByXMLUnescaping] "
+	    @"#6", OFInvalidFormatException, [@"&#xg;" stringByXMLUnescaping])
 
 	TEST(@"-[stringByXMLUnescapingWithDelegate:]",
 	    (h = [[[EntityHandler alloc] init] autorelease]) &&
 	    [[@"x&foo;y" stringByXMLUnescapingWithDelegate: h]
 	    isEqual: @"xbary"])