Merge 'upstream/master'

1 files changed, 7 insertions, 3 deletions

diff --git a/xmpp-vala/src/module/xep/0260_jingle_socks5_bytestreams.vala b/xmpp-vala/src/module/xep/0260_jingle_socks5_bytestreams.vala
index 852cc7eb..7f44bda2 100644
--- a/xmpp-vala/src/module/xep/0260_jingle_socks5_bytestreams.vala
+++ b/xmpp-vala/src/module/xep/0260_jingle_socks5_bytestreams.vala
@@ -328,9 +328,13 @@ class LocalListener {
             }
         } catch (Error e) {
             warning("Jingle SOCKS5 bytestream establish error cid %s: %s", cid, e.message);
-            // Send a "general SOCKS server failure" (0x01)
-            yield conn.output_stream.write_all_async({0x05, 0x01}, GLib.Priority.DEFAULT, null, out written);
-            yield conn.output_stream.close_async();
+            try {
+                // Send a "general SOCKS server failure" (0x01)
+                yield conn.output_stream.write_all_async({0x05, 0x01}, GLib.Priority.DEFAULT, null, out written);
+                yield conn.output_stream.close_async();
+            } catch (Error sub) {
+                // Ignoring
+            }
         }
     }