Add missing null-checks.