2 files changed, 6 insertions, 4 deletions
diff --git a/xmpp-vala/src/core/stanza_reader.vala b/xmpp-vala/src/core/stanza_reader.vala
index 0079dc38..f4b900d1 100644
--- a/xmpp-vala/src/core/stanza_reader.vala
+++ b/xmpp-vala/src/core/stanza_reader.vala
@@ -54,8 +54,6 @@ public class StanzaReader {
             buffer_pos = 0;
         } catch (GLib.IOError e) {
             throw new XmlError.IO_ERROR("IOError in GLib: %s".printf(e.message));
-        } catch (GLib.TlsError e) {
-            throw new XmlError.IO_ERROR("TlsError in GLib: %s".printf(e.message));
         }
     }
 
diff --git a/xmpp-vala/src/core/xmpp_stream.vala b/xmpp-vala/src/core/xmpp_stream.vala
index 9d700b4d..0a1f4120 100644
--- a/xmpp-vala/src/core/xmpp_stream.vala
+++ b/xmpp-vala/src/core/xmpp_stream.vala
@@ -360,8 +360,12 @@ public class StartTlsConnectionProvider : ConnectionProvider {
     }
 
     public override IOStream? connect(XmppStream stream) {
-        SocketClient client = new SocketClient();
-        return client.connect_to_host(srv_target.get_hostname(), srv_target.get_port());
+        try {
+            SocketClient client = new SocketClient();
+            return client.connect_to_host(srv_target.get_hostname(), srv_target.get_port());
+        } catch (Error e) {
+            return null;
+        }
     }
 
     public override string get_id() { return "start_tls"; }