1:  3b04790e2 = 1:  8e3c6a79b test: harden processing failure diagnostics and cleanup
