[#6032] Better errors and retries on re-attaching EIPs