Put errexit to a better place.
Fixing the Heisenbug?
Fixed error colection.
Merge branch 'espresso'