diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index ce2103dce68463701f4469eb03164550d673d385..e2028c7bcf4f85cbcc4f2881e09c3e66ba365a37 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -319,12 +319,7 @@ public class MessageParser extends AbstractParser implements
 			}
 		} else if (packet.hasChild("x", "jabber:x:conference")) {
 			Element x = packet.findChild("x", "jabber:x:conference");
-            Jid jid;
-            try {
-                jid = Jid.fromString(x.getAttribute("jid"));
-            } catch (InvalidJidException e) {
-                jid = null;
-            }
+            Jid jid = x.getAttributeAsJid("jid");
             String password = x.getAttribute("password");
 			if (jid != null) {
 				Conversation conversation = mXmppConnectionService