more null checks