@@ -55,11 +55,12 @@
 	return [[[self alloc] initWithName: name
 				      type: type_
 					ID: ID_] autorelease];
 }
 
-+ stanzaWithElement: (OFXMLElement*)elem {
++ stanzaWithElement: (OFXMLElement*)elem
+{
 	return [[[self alloc] initWithElement: elem] autorelease];
 }
 
 - initWithName: (OFString*)name_
 {
@@ -86,18 +87,18 @@
 
 - initWithName: (OFString*)name_
 	  type: (OFString*)type_
 	    ID: (OFString*)ID_
 {
-	if (![name_ isEqual: @"iq"] &&
-	    ![name_ isEqual: @"message"] &&
-	    ![name_ isEqual: @"presence"])
-		of_log(@"Invalid stanza name!");
-
 	self = [super initWithName: name_];
 
 	@try {
+		if (![name_ isEqual: @"iq"] && ![name_ isEqual: @"message"] &&
+		    ![name_ isEqual: @"presence"])
+			@throw [OFInvalidArgumentException newWithClass: isa
+							       selector: _cmd];
+
 		[self setDefaultNamespace: @"jabber:client"];
 
 		if (type_)
 			[self setType: type_];