More nullptr checks