@@ -63,10 +63,11 @@
 
 	@try {
 		sock = [[OFTCPSocket alloc] init];
 		port = 5222;
 		encrypted = NO;
+		streamOpen = NO;
 		callbacks = [[OFMutableDictionary alloc] init];
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
@@ -313,10 +314,15 @@
 
 - (BOOL)encrypted
 {
 	return encrypted;
 }
+
+- (BOOL)streamOpen
+{
+	return streamOpen;
+}
 
 - (void)checkCertificate
 {
 	X509Certificate *cert;
 	OFDictionary *SANs;
@@ -459,14 +465,16 @@
   didNotExpectCloseTag: (OFString *)name
 	    withPrefix: (OFString *)prefix
 	     namespace: (OFString *)ns
 {
 	if (![name isEqual: @"stream"] || ![prefix isEqual: @"stream"] ||
-	    ![ns isEqual: XMPP_NS_STREAM]) {
+	    ![ns isEqual: XMPP_NS_STREAM])
 		@throw [OFMalformedXMLException
 		    exceptionWithClass: [builder class]
 				parser: nil];
+	else {
+		[self close];
 	}
 }
 
 - (void)XMPP_startStream
 {
@@ -494,10 +502,19 @@
 	[sock writeFormat: @"<?xml version='1.0'?>\n"
 			   @"<stream:stream to='%@' "
 			   @"xmlns='" XMPP_NS_CLIENT @"' "
 			   @"xmlns:stream='" XMPP_NS_STREAM @"' "
 			   @"version='1.0'>", domain];
+	streamOpen = YES;
+}
+
+- (void)close
+{
+	if (streamOpen) {
+		[sock writeString: @"</stream:stream>"];
+		streamOpen = NO;
+	}
 }
 
 - (void)XMPP_handleStanza: (OFXMLElement*)element
 {
 	if ([[element name] isEqual: @"iq"]) {
@@ -528,13 +545,12 @@
 		return;
 	}
 
 	if ([[element name] isEqual: @"error"]) {
 		OFString *condition, *reason;
-		[parser setDelegate: self];
-		[sock writeString: @"</stream:stream>"];
-		[sock close];
+		[self close];
+		[sock close]; // Remote has already closed his stream
 
 		if ([element elementForName: @"bad-format"
 				  namespace: XMPP_NS_XMPP_STREAM])
 			condition = @"bad-format";
 		else if ([element elementForName: @"bad-namespace-prefix"