Index: src/runtime/lookup.m
==================================================================
--- src/runtime/lookup.m
+++ src/runtime/lookup.m
@@ -48,17 +48,13 @@
 	if (!(object_getClass(obj)->info & OBJC_CLASS_INFO_INITIALIZED)) {
 		Class cls = (is_class ? (Class)obj : object_getClass(obj));
 
 		objc_initialize_class(cls);
 
-		if (!(cls->info & OBJC_CLASS_INFO_SETUP)) {
-			if (is_class)
-				return lookup(nil, sel);
-			else
-				OBJC_ERROR("Could not dispatch message for "
-				    "incomplete class %s!", cls->name);
-		}
+		if (!(cls->info & OBJC_CLASS_INFO_SETUP))
+			OBJC_ERROR("Could not dispatch message for incomplete "
+			    "class %s!", cls->name);
 
 		/*
 		 * We don't need to handle the case that super was called.
 		 * The reason for this is that a call to super is not possible
 		 * before a message to the class has been sent and it thus has
@@ -65,11 +61,11 @@
 		 * been initialized together with its superclasses.
 		 */
 		return lookup(obj, sel);
 	}
 
-	/* Try resolveClassMethod:/resolveInstanceMethod: */
+	/* Try resolveClassMethod: / resolveInstanceMethod: */
 	if (class_isMetaClass(object_getClass(obj))) {
 		Class cls = object_getClass(obj);
 
 		if (class_respondsToSelector(cls,
 		    @selector(resolveClassMethod:)) &&