@@ -29,11 +29,10 @@
 #import "OFXMLElement.h"
 
 #import "OFHTTPRequestFailedException.h"
 #import "OFInvalidArgumentException.h"
 #import "OFInvalidFormatException.h"
-#import "OFNotImplementedException.h"
 #import "OFOutOfMemoryException.h"
 #import "OFOutOfRangeException.h"
 
 #import "autorelease.h"
 #import "base64.h"
@@ -557,13 +556,12 @@
 {
 	void *pool;
 	OFXMLElement *element;
 
 	if (itemSize != 1)
-		@throw [OFNotImplementedException
-		    exceptionWithClass: [self class]
-			      selector: _cmd];
+		@throw [OFInvalidArgumentException
+		    exceptionWithClass: [self class]];
 
 	pool = objc_autoreleasePoolPush();
 	element = [OFXMLElement
 	    elementWithName: [self className]
 		  namespace: OF_SERIALIZATION_NS