[PATCH 1/2] Translate storage errors (#877658)