diff --git a/src/XMPPConnection.m b/src/XMPPConnection.m
index b196f1e..0b9eb8e 100644
--- a/src/XMPPConnection.m
+++ b/src/XMPPConnection.m
@@ -315,8 +315,14 @@
 		return;
 	}
 
-	[parser parseBuffer: buffer
-		     length: length];
+	@try {
+		[parser parseBuffer: buffer
+			 length: length];
+	} @catch (OFMalformedXMLException *e) {
+		[self XMPP_sendStreamError: @"bad-format"
+				      text: nil];
+		[self close];
+	}
 
 	[oldParser release];
 	[oldElementBuilder release];