Finished bug #2451.  Fixed the retrying part to make it
more robust.
1 file changed