diff --git a/lib/csharp/src/Transport/TSocket.cs b/lib/csharp/src/Transport/TSocket.cs
index 7717cfb..35fbe97 100644
--- a/lib/csharp/src/Transport/TSocket.cs
+++ b/lib/csharp/src/Transport/TSocket.cs
@@ -177,16 +177,21 @@
                     if( hlp.Client.Client != null)
                         hlp.Client.EndConnect(asyncres);
                 }
-                catch (SocketException)
+                catch (Exception)
                 {
                     // catch that away
                 }
 
                 if (hlp.DoCleanup) 
                 {
-                    asyncres.AsyncWaitHandle.Close();
-                    if (hlp.Client is IDisposable)
-                        ((IDisposable)hlp.Client).Dispose();
+                	try {
+                    	asyncres.AsyncWaitHandle.Close();
+                	} catch (Exception) {}
+                	
+                	try {
+                    	if (hlp.Client is IDisposable)
+	                        ((IDisposable)hlp.Client).Dispose();
+                	} catch (Exception) {}
                     hlp.Client = null;
                 }
             }