3 files changed, 22 insertions, 8 deletions
diff --git a/Swiften/Client/ClientError.h b/Swiften/Client/ClientError.h
index 2f2d2af..a4dc040 100644
--- a/Swiften/Client/ClientError.h
+++ b/Swiften/Client/ClientError.h
@@ -28,6 +28,9 @@ namespace Swift {
 				ClientCertificateLoadError,
 				ClientCertificateError,
 
+				// Certifate on smartcard was removed
+				CertificateCardRemoved,
+
 				// Certificate verification errors
 				UnknownCertificateError,
 				CertificateExpiredError,
diff --git a/Swiften/Client/CoreClient.cpp b/Swiften/Client/CoreClient.cpp
index 14481c6..45d80aa 100644
--- a/Swiften/Client/CoreClient.cpp
+++ b/Swiften/Client/CoreClient.cpp
@@ -15,6 +15,7 @@
 #include <Swiften/Base/Algorithm.h>
 #include <Swiften/Client/ClientSession.h>
 #include <Swiften/TLS/CertificateVerificationError.h>
+#include <Swiften/TLS/TLSError.h>
 #include <Swiften/Network/ChainedConnector.h>
 #include <Swiften/Network/NetworkFactories.h>
 #include <Swiften/Network/ProxyProvider.h>
@@ -217,21 +218,31 @@ void CoreClient::handleSessionFinished(boost::shared_ptr<Error> error) {
 					break;
 			}
 		}
-		else if (boost::shared_ptr<SessionStream::Error> actualError = boost::dynamic_pointer_cast<SessionStream::Error>(error)) {
+		else if (boost::shared_ptr<TLSError> actualError = boost::dynamic_pointer_cast<TLSError>(error)) {
+			switch(actualError->getType()) {
+				case TLSError::CertificateCardRemoved:
+					clientError = ClientError(ClientError::CertificateCardRemoved);
+					break;
+				default:
+					clientError = ClientError(ClientError::TLSError);
+					break;
+			}
+		}
+		else if (boost::shared_ptr<SessionStream::SessionStreamError> actualError = boost::dynamic_pointer_cast<SessionStream::SessionStreamError>(error)) {
 			switch(actualError->type) {
-				case SessionStream::Error::ParseError:
+				case SessionStream::SessionStreamError::ParseError:
 					clientError = ClientError(ClientError::XMLError);
 					break;
-				case SessionStream::Error::TLSError:
+				case SessionStream::SessionStreamError::TLSError:
 					clientError = ClientError(ClientError::TLSError);
 					break;
-				case SessionStream::Error::InvalidTLSCertificateError:
+				case SessionStream::SessionStreamError::InvalidTLSCertificateError:
 					clientError = ClientError(ClientError::ClientCertificateLoadError);
 					break;
-				case SessionStream::Error::ConnectionReadError:
+				case SessionStream::SessionStreamError::ConnectionReadError:
 					clientError = ClientError(ClientError::ConnectionReadError);
 					break;
-				case SessionStream::Error::ConnectionWriteError:
+				case SessionStream::SessionStreamError::ConnectionWriteError:
 					clientError = ClientError(ClientError::ConnectionWriteError);
 					break;
 			}
diff --git a/Swiften/Client/UnitTest/ClientSessionTest.cpp b/Swiften/Client/UnitTest/ClientSessionTest.cpp
index a6d5a3a..6793643 100644
--- a/Swiften/Client/UnitTest/ClientSessionTest.cpp
+++ b/Swiften/Client/UnitTest/ClientSessionTest.cpp
@@ -420,11 +420,11 @@ class ClientSessionTest : public CppUnit::TestFixture {
 				}
 
 				void breakConnection() {
-					onClosed(boost::make_shared<SessionStream::Error>(SessionStream::Error::ConnectionReadError));
+					onClosed(boost::make_shared<SessionStream::SessionStreamError>(SessionStream::SessionStreamError::ConnectionReadError));
 				}
 
 				void breakTLS() {
-					onClosed(boost::make_shared<SessionStream::Error>(SessionStream::Error::TLSError));
+					onClosed(boost::make_shared<SessionStream::SessionStreamError>(SessionStream::SessionStreamError::TLSError));
 				}