Partial revert of 5ada8cf9a0d4fc8845c5acdaadd12b357816bd8e: don't hide
exceptions