Cleanup error handling with failure or something like that

[Centril]

In an effort to make the code-base more understandable,
cleanup stuff per #204 (comment) with failure or a similar solution.