Revert "make sure to return all unexpected errors"

This reverts commit fa3b733ed2d3f039842d19499b8ba6c7ff8669f4.