And even more null checks