Handle edge cases in retry

**Problem**
When working with store, the error messages could be more descriptive.

**Suggestion**
Improve error handling and add detailed error messages.

**Context**
This would help with debugging and maintenance.

Start by locating the retry handling and store-related error paths in the repository, then read how current failures are surfaced. Identify the retry edge cases and the existing error-message conventions before changing anything. Done means the relevant failures produce detailed, useful messages and the affected behavior is covered by tests where the repository already has them.

Written by the indexing model from the issue text.