Revert "stop dying on known Errors; don't hide useful code"

...and now I understand why this was here
This reverts commit 06d25cf836231c6a3f3813e08832afcf4f4fddcb.