Added more null checks