416477 Improved consumeAll error handling