1 files changed, 5 insertions, 0 deletions
diff --git a/Swiften/Client/Client.cpp b/Swiften/Client/Client.cpp
index 874e23b..3962281 100644
--- a/Swiften/Client/Client.cpp
+++ b/Swiften/Client/Client.cpp
@@ -86,12 +86,16 @@ void Client::closeConnection() {
 		connection_->disconnect();
 		connection_.reset();
 	}
 }
 
 void Client::send(boost::shared_ptr<Stanza> stanza) {
+	if (!isAvailable()) {
+		std::cerr << "Warning: Client: Trying to send a stanza while disconnected." << std::endl;
+		return;
+	}
 	session_->sendElement(stanza);
 }
 
 void Client::sendIQ(boost::shared_ptr<IQ> iq) {
 	send(iq);
 }
@@ -186,12 +190,13 @@ void Client::handleSessionFinished(boost::shared_ptr<Error> error) {
 		onError(clientError);
 	}
 	session_.reset();
 }
 
 void Client::handleNeedCredentials() {
+	assert(session_);
 	session_->sendCredentials(password_);
 }
 
 void Client::handleDataRead(const String& data) {
 	onDataRead(data);
 }