changed null pointers