Revert "try to prevent error bubbling"

This reverts commit 5ef751528a51f35749732c4d7e167b33905a2d37.