1 files changed, 9 insertions, 2 deletions
diff --git a/Swiften/Client/CoreClient.cpp b/Swiften/Client/CoreClient.cpp
index fa9bd33..af64577 100644
--- a/Swiften/Client/CoreClient.cpp
+++ b/Swiften/Client/CoreClient.cpp
@@ -187,17 +187,24 @@ void CoreClient::handleConnectorFinished(boost::shared_ptr<Connection> connectio
 			clientError = boost::dynamic_pointer_cast<DomainNameResolveError>(error) ? boost::optional<ClientError>(ClientError::DomainNameResolveError) : boost::optional<ClientError>(ClientError::ConnectionError);
 		}
 		onDisconnected(clientError);
 	}
 	else {
 		assert(!connection_);
+		assert(!sessionStream_);
+
+		if (certificate_ && certificate_->isNull()) {
+			//certificate cannot be read so do not initailise session
+			onDisconnected(boost::optional<ClientError>(ClientError::ClientCertificateLoadError));
+			return;
+		}
+
 		connection_ = connection;
 
-		assert(!sessionStream_);
 		sessionStream_ = boost::make_shared<BasicSessionStream>(ClientStreamType, connection_, getPayloadParserFactories(), getPayloadSerializers(), networkFactories->getTLSContextFactory(), networkFactories->getTimerFactory(), networkFactories->getXMLParserFactory(), options.tlsOptions);
-		if (certificate_ && !certificate_->isNull()) {
+		if (certificate_) {
 			sessionStream_->setTLSCertificate(certificate_);
 		}
 		sessionStream_->onDataRead.connect(boost::bind(&CoreClient::handleDataRead, this, _1));
 		sessionStream_->onDataWritten.connect(boost::bind(&CoreClient::handleDataWritten, this, _1));
 
 		bindSessionToStream();