fixup exception handling in consumer