Added more null cases for rankings