v0.9.22 - Handles store shutdowns better