[BZ 1120418] first cut at dealing with failures