Throwables thrown on update retries are caught and handled

Closes #6355.
Also contains an integration test demonstrating the bug and validating the fix.