Merge 'upstream/master'

1 files changed, 6 insertions, 1 deletions

diff --git a/xmpp-vala/src/module/xep/0166_jingle/jingle_flag.vala b/xmpp-vala/src/module/xep/0166_jingle/jingle_flag.vala
index 9f0acd27..f451f4c9 100644
--- a/xmpp-vala/src/module/xep/0166_jingle/jingle_flag.vala
+++ b/xmpp-vala/src/module/xep/0166_jingle/jingle_flag.vala
@@ -24,7 +24,12 @@ public class Xmpp.Xep.Jingle.Flag : XmppStreamFlag {
 
     public async Session? get_session(string sid) {
         if (promises.has_key(sid)) {
-            return yield promises[sid].future.wait_async();
+            try {
+                return yield promises[sid].future.wait_async();
+            } catch (FutureError e) {
+                warning("Failed waiting for session: %s", e.message);
+                return null;
+            }
         }
         return sessions[sid];
     }