diff --git a/src/common/gajim.py b/src/common/gajim.py
index 9a56eaba4..7ae28d650 100644
--- a/src/common/gajim.py
+++ b/src/common/gajim.py
@@ -84,8 +84,11 @@ def get_nick_from_fjid(jid):
 def get_room_and_nick_from_fjid(jid):
 	# fake jid is the jid for a contact in a room
 	# gaim@conference.jabber.org/nick/nick-continued
-	# return ('gaim@conference.jabber.org', 'nick/nick-continued')
-	return jid.split('/', 1)
+	# return ('gaim@conference.jabber.org', 'nick/nick-continued')
+	l = jid.split('/', 1)
+	if len(l) = 1: #No nick
+		l.append('')
+	return l
 
 def get_contact_instances_from_jid(account, jid):
 	''' we may have two or more resources on that jid '''