Merge pull request #462 from youyong205/master

fix data store error
fix npe