diff --git a/src/XrdCl/XrdClSocket.cc b/src/XrdCl/XrdClSocket.cc
index 7fd7ba6dca5..e489753b52b 100644
--- a/src/XrdCl/XrdClSocket.cc
+++ b/src/XrdCl/XrdClSocket.cc
@@ -753,9 +753,9 @@ namespace XrdCl
       if( !pTls ) pTls = new Tls( this, socketHandler );
       return pTls->Connect( thehost, &pServerAddr );
     }
-    catch( std::invalid_argument& ex )
+    catch( std::exception& ex )
     {
-      Status( stError, errTlsError );
+      return Status( stError, errTlsError );
     }
 
     return Status();