Improve the error message if retry fails