- fix null pointer