Revert "Polish stop-on-error method"

This reverts commit 38ffb2b846911de941b74ce5e07c19c09b677b82.