fixed more null pointers