Improved behaviour with non existing roster data