This fixes #7545.  It now gives up if one fails.