@@ -10,10 +10,11 @@
  */
 
 #include "config.h"
 
 #import "OFConstString.h"
+#import "OFExceptions.h"
 
 #ifndef __objc_INCLUDE_GNU
 void *_OFConstStringClassReference;
 #endif
 
@@ -23,10 +24,15 @@
 {
 	objc_setFutureClass((Class)&_OFConstStringClassReference,
 	    "OFConstString");
 }
 #endif
+
+- autorelease
+{
+	return self;
+}
 
 - retain
 {
 	return self;
 }
@@ -38,10 +44,12 @@
 - (size_t)retainCount
 {
 	return SIZE_MAX;
 }
 
-- autorelease
+- (void)dealloc
 {
-	return self;
+	@throw [OFNotImplementedException newWithClass: isa
+					   andSelector: _cmd];
+	[super dealloc];	/* Get rid of stupid warning */
 }
 @end