Added more null cases