Revert "fix error handling"

According to psychon, there are no errors to be expected here.

This reverts commit 529d71ae35a0b0646cd84edb7951ad66137623d3.