fix bug when an event dosen't have a badge..
Merge origin/master