@@ -313,10 +313,14 @@
 }
 
 - (void)elementBuilder: (OFXMLElementBuilder*)builder
        didBuildElement: (OFXMLElement*)element
 {
+	/* Ignore whitespace elements */
+	if ([element name] == nil)
+		return;
+
 	[element setDefaultNamespace: XMPP_NS_CLIENT];
 	[element setPrefix: @"stream"
 	      forNamespace: XMPP_NS_STREAM];
 
 	of_log(@"In:  %@", element);
@@ -588,12 +592,12 @@
 
 	if ([delegate respondsToSelector: @selector(connection:didReceiveIQ:)])
 		handled = [delegate connection: self
 				  didReceiveIQ: iq];
 
-	if (!handled && ![[iq type] isEqual: @"error"]
-		     && ![[iq type] isEqual: @"result"]) {
+	if (!handled && ![[iq type] isEqual: @"error"] &&
+	    ![[iq type] isEqual: @"result"]) {
 		[self sendStanza: [iq errorIQWithType: @"cancel"
 					    condition: @"service-unavailable"]];
 	}
 }