Even more null checking