@@ -19,10 +19,11 @@
 #include <string.h>
 
 #import "OFString.h"
 
 #import "OFInvalidFormatException.h"
+#import "OFUnknownXMLEntityException.h"
 
 int _OFString_XMLUnescaping_reference;
 
 static OF_INLINE OFString*
 parseNumericEntity(const char *entity, size_t length)
@@ -151,12 +152,12 @@
 				    stringWithUTF8String: entity
 						  length: entityLength];
 				tmp = lookup(context, self, name);
 
 				if (tmp == nil)
-					@throw [OFInvalidFormatException
-					    exception];
+					@throw [OFUnknownXMLEntityException
+					    exceptionWithEntityName: name];
 
 				[ret appendString: tmp];
 				objc_autoreleasePoolPop(pool);
 			}