Yet more nullptr checks