modified some null pointer