fix hang if no store available
Merge pull request #170 from rusmonster/fix_no_store

fix hang if no store available