even more null checks