More null checking.