more null checking...