Revert "Make error handling hopefully simpler"

This reverts commit 67f224f7bf038b1dcf284bcaf7c59fcebe45aef7.
make run