WIP: Abort on failure

:warning: