Better handling of duplicate session information