Set timeout to 5s for store testing
Improve store error handling