1 files changed, 8 insertions, 2 deletions
diff --git a/xmpp-vala/src/module/xep/0048_conference.vala b/xmpp-vala/src/module/xep/0048_conference.vala
index d78a2685..fdc26152 100644
--- a/xmpp-vala/src/module/xep/0048_conference.vala
+++ b/xmpp-vala/src/module/xep/0048_conference.vala
@@ -20,8 +20,14 @@ public class Bookmarks1Conference : Conference {
     }
 
     private Jid jid_;
-    public override Jid jid {
-    get { return jid_ ?? (jid_ = Jid.parse(stanza_node.get_attribute(ATTRIBUTE_JID))); }
+    public override Jid? jid {
+    get {
+        try {
+            return jid_ ?? (jid_ = new Jid(stanza_node.get_attribute(ATTRIBUTE_JID)));
+        } catch (InvalidJidError e) {
+            return null;
+        }
+    }
     set { stanza_node.set_attribute(ATTRIBUTE_JID, value.to_string()); }
     }