More null checks!