Refactor volume store's error usage Upstream-commit: 2bb1c530d7e0f20b5822cbff7656c4e0a7cd4930 Component: engine