Fix an issue where we were not raising when retry failed