1 files changed, 3 insertions, 1 deletions
diff --git a/Swiften/Client/ClientSession.cpp b/Swiften/Client/ClientSession.cpp
index 791ee75..fd001a1 100644
--- a/Swiften/Client/ClientSession.cpp
+++ b/Swiften/Client/ClientSession.cpp
@@ -414,19 +414,21 @@ void ClientSession::finish() {
 	finishSession(boost::shared_ptr<Error>());
 }
 
 void ClientSession::finishSession(Error::Type error) {
 	finishSession(boost::make_shared<Swift::ClientSession::Error>(error));
 }
 
 void ClientSession::finishSession(boost::shared_ptr<Swift::Error> error) {
 	state = Finishing;
-	error_ = error;
+	if (!error_) {
+		error_ = error;
+	}
 	assert(stream->isOpen());
 	if (stanzaAckResponder_) {
 		stanzaAckResponder_->handleAckRequestReceived();
 	}
 	stream->writeFooter();
 	stream->close();
 }
 
 void ClientSession::requestAck() {