add store information
fix null pointer issues