Merge pull request #17193 from cpuguy83/refactor_store_errors

Refactor volume store's error usage