diff --git a/xmpp-vala/src/module/presence/flag.vala b/xmpp-vala/src/module/presence/flag.vala
index 8e13d0ad..cc0a1f6b 100644
--- a/xmpp-vala/src/module/presence/flag.vala
+++ b/xmpp-vala/src/module/presence/flag.vala
@@ -13,6 +13,9 @@ public class Flag : XmppStreamFlag {
     }
 
     public Gee.List<Jid>? get_resources(Jid jid) {
+        if (!resources.has_key(jid)) return null;
+        ArrayList<Jid> ret = new ArrayList<Jid>();
+        ret.add_all(resources[jid]);
         return resources[jid];
     }