3 files changed, 13 insertions, 6 deletions
diff --git a/Sluift/Helpers.cpp b/Sluift/Helpers.cpp
index 9819f76..12d2f8f 100644
--- a/Sluift/Helpers.cpp
+++ b/Sluift/Helpers.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 2013-2014 Isode Limited.
+ * Copyright (c) 2013-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Sluift/Helpers.h>
 
@@ -28,13 +28,13 @@ std::string Swift::getErrorString(const ClientError& error) {
 		case ClientError::ResourceBindError: reason += "Error binding resource"; break;
 		case ClientError::RevokedError: reason += "Certificate got revoked"; break;
 		case ClientError::RevocationCheckFailedError: reason += "Failed to do revokation check"; break;
 		case ClientError::SessionStartError: reason += "Error starting session"; break;
 		case ClientError::StreamError: reason += "Stream error"; break;
 		case ClientError::TLSError: reason += "Encryption error"; break;
-		case ClientError::ClientCertificateLoadError: reason += "Error loading certificate (Invalid password?)"; break;
+		case ClientError::ClientCertificateLoadError: reason += "Error loading certificate (Invalid file or password?)"; break;
 		case ClientError::ClientCertificateError: reason += "Certificate not authorized"; break;
 		case ClientError::UnknownCertificateError: reason += "Unknown certificate"; break;
 		case ClientError::CertificateCardRemoved: reason += "Certificate card removed"; break;
 		case ClientError::CertificateExpiredError: reason += "Certificate has expired"; break;
 		case ClientError::CertificateNotYetValidError: reason += "Certificate is not yet valid"; break;
 		case ClientError::CertificateSelfSignedError: reason += "Certificate is self-signed"; break;
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index a0dde5b..dcdd22b 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -605,13 +605,13 @@ void MainController::performLoginFromCachedCredentials() {
 
 		client_->getVCardManager()->onVCardChanged.connect(boost::bind(&MainController::handleVCardReceived, this, _1, _2));
 		presenceNotifier_ = new PresenceNotifier(client_->getStanzaChannel(), notifier_, client_->getMUCRegistry(), client_->getAvatarManager(), client_->getNickResolver(), client_->getPresenceOracle(), networkFactories_->getTimerFactory());
 		presenceNotifier_->onNotificationActivated.connect(boost::bind(&MainController::handleNotificationClicked, this, _1));
 		eventNotifier_ = new EventNotifier(eventController_, notifier_, client_->getAvatarManager(), client_->getNickResolver());
 		eventNotifier_->onNotificationActivated.connect(boost::bind(&MainController::handleNotificationClicked, this, _1));
-		if (certificate_ && !certificate_->isNull()) {
+		if (certificate_) {
 			client_->setCertificate(certificate_);
 		}
 		boost::shared_ptr<Presence> presence(new Presence());
 		presence->setShow(static_cast<StatusShow::Type>(profileSettings_->getIntSetting("lastShow", StatusShow::Online)));
 		presence->setStatus(profileSettings_->getStringSetting("lastStatus"));
 		statusTracker_->setRequestedPresence(presence);
@@ -661,13 +661,13 @@ void MainController::handleDisconnected(const boost::optional<ClientError>& erro
 			case ClientError::NoSupportedAuthMechanismsError: message = QT_TRANSLATE_NOOP("", "Authentication mechanisms not supported"); break;
 			case ClientError::UnexpectedElementError: message = QT_TRANSLATE_NOOP("", "Unexpected response"); break;
 			case ClientError::ResourceBindError: message = QT_TRANSLATE_NOOP("", "Error binding resource"); break;
 			case ClientError::SessionStartError: message = QT_TRANSLATE_NOOP("", "Error starting session"); break;
 			case ClientError::StreamError: message = QT_TRANSLATE_NOOP("", "Stream error"); break;
 			case ClientError::TLSError: message = QT_TRANSLATE_NOOP("", "Encryption error"); break;
-			case ClientError::ClientCertificateLoadError: message = QT_TRANSLATE_NOOP("", "Error loading certificate (Invalid password?)"); break;
+			case ClientError::ClientCertificateLoadError: message = QT_TRANSLATE_NOOP("", "Error loading certificate (Invalid file or password?)"); break;
 			case ClientError::ClientCertificateError: message = QT_TRANSLATE_NOOP("", "Certificate not authorized"); break;
 			case ClientError::CertificateCardRemoved: message = QT_TRANSLATE_NOOP("", "Certificate card removed"); forceSignout = true; break;
 
 			case ClientError::UnknownCertificateError: certificateErrorMessage = QT_TRANSLATE_NOOP("", "Unknown certificate"); break;
 			case ClientError::CertificateExpiredError: certificateErrorMessage = QT_TRANSLATE_NOOP("", "Certificate has expired"); break;
 			case ClientError::CertificateNotYetValidError: certificateErrorMessage = QT_TRANSLATE_NOOP("", "Certificate is not yet valid"); break;
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();