Small bug fix for BadgeNotFoundException