* Fix errors being nested. Make code more resilient to this situation * address review comments * code review comment (cherry picked from commit 8782f4e3a4) Co-authored-by: Guillermo Vayá <guillermo.vaya@mattermost.com>
8782f4e3a4