null pointer fixed