feat: simplified error handling #202

Closed
septs wants to merge 2 commits from septs:simplified-error-handling into master

2 commits