null pointer fixed, no feature affected