@@ -13,19 +13,19 @@
  * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
  * file.
  */
 
 #include "config.h"
+
+#include <stdlib.h>
 
 #import "OFObject.h"
 #import "OFObject+Serialization.h"
 #import "OFSerialization.h"
 #import "OFString.h"
 #import "OFXMLElement.h"
 
-#import "OFNotImplementedException.h"
-
 #import "autorelease.h"
 
 int _OFObject_Serialization_reference;
 
 @implementation OFObject (Serialization)
@@ -34,14 +34,14 @@
 	void *pool;
 	OFXMLElement *element;
 	OFXMLElement *root;
 	OFString *ret;
 
-	if (![self conformsToProtocol: @protocol(OFSerialization)])
-		@throw [OFNotImplementedException
-		    exceptionWithClass: [self class]
-			      selector: @selector(stringBySerializing)];
+	if (![self conformsToProtocol: @protocol(OFSerialization)]) {
+		[self doesNotRecognizeSelector: _cmd];
+		abort();
+	}
 
 	pool = objc_autoreleasePoolPush();
 	element = [(id)self XMLElementBySerializing];
 
 	root = [OFXMLElement elementWithName: @"serialization"