Add more null checks.