fixed some more null pointer errors