diff --git a/src/common/helpers.py b/src/common/helpers.py index bc2dccf04b089a9e176b5d1ea28d682ca3b338e8..1d01a81206ec1fa262e55847f8cf95b21e7f309f 100644 --- a/src/common/helpers.py +++ b/src/common/helpers.py @@ -1342,11 +1342,11 @@ def get_subscription_request_msg(account=None): our_jid = gajim.get_jid_from_account(account) vcard = gajim.connections[account].get_cached_vcard(our_jid) name = '' - if 'N' in vcard: - if 'GIVEN' in vcard['N'] and 'FAMILY' in vcard['N']: - name = vcard['N']['GIVEN'] + ' ' + vcard['N']['FAMILY'] - if not name: - if 'FN' in vcard: + if vcard: + if 'N' in vcard: + if 'GIVEN' in vcard['N'] and 'FAMILY' in vcard['N']: + name = vcard['N']['GIVEN'] + ' ' + vcard['N']['FAMILY'] + if not name and 'FN' in vcard: name = vcard['FN'] nick = gajim.nicks[account] if name and nick: