@@ -26,17 +26,17 @@
 #import "autorelease.h"
 
 static OFNull *null = nil;
 
 @implementation OFNull
++ (void)initialize
+{
+	null = [[self alloc] init];
+}
+
 + (OFNull*)null
 {
-	if (null != nil)
-		return null;
-
-	null = [[self alloc] init];
-
 	return null;
 }
 
 - initWithSerialization: (OFXMLElement*)element
 {