more null checking