I think it would be useful to have a retry / timeout loop here, but I also think that could be done in a future update...