@@ -28,10 +28,11 @@
 
 #import "OFInvalidArgumentException.h"
 #import "OFInvalidEncodingException.h"
 #import "OFInvalidFormatException.h"
 #import "OFOutOfRangeException.h"
+#import "OFUnknownXMLEntityException.h"
 
 #import "macros.h"
 
 #import "TestsAppDelegate.h"
 
@@ -663,22 +664,22 @@
 	    [[@"y" stringByXMLUnescaping] isEqual: @"y"] &&
 	    [[@"ä" stringByXMLUnescaping] isEqual: @"ä"] &&
 	    [[@"€" stringByXMLUnescaping] isEqual: @"€"] &&
 	    [[@"𝄞" stringByXMLUnescaping] isEqual: @"𝄞"])
 
-	EXPECT_EXCEPTION(@"Detect invalid entities in -[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])
+	EXPECT_EXCEPTION(@"Detect unknown entities in -[stringByXMLUnescaping]",
+	    OFUnknownXMLEntityException, [@"&foo;" stringByXMLUnescaping])
+	EXPECT_EXCEPTION(@"Detect invalid entities in -[stringByXMLUnescaping] "
+	    @"#1", OFInvalidFormatException, [@"x&amp" stringByXMLUnescaping])
+	EXPECT_EXCEPTION(@"Detect invalid entities in -[stringByXMLUnescaping] "
+	    @"#2", OFInvalidFormatException, [@"&#;" stringByXMLUnescaping])
+	EXPECT_EXCEPTION(@"Detect invalid entities in -[stringByXMLUnescaping] "
+	    @"#3", OFInvalidFormatException, [@"&#x;" stringByXMLUnescaping])
+	EXPECT_EXCEPTION(@"Detect invalid entities in -[stringByXMLUnescaping] "
+	    @"#4", OFInvalidFormatException, [@"&#g;" stringByXMLUnescaping])
+	EXPECT_EXCEPTION(@"Detect invalid entities in -[stringByXMLUnescaping] "
+	    @"#5", OFInvalidFormatException, [@"&#xg;" stringByXMLUnescaping])
 
 	TEST(@"-[stringByXMLUnescapingWithDelegate:]",
 	    (h = [[[EntityHandler alloc] init] autorelease]) &&
 	    [[@"x&foo;y" stringByXMLUnescapingWithDelegate: h]
 	    isEqual: @"xbary"])