Revert "update work-flow branch with new error handling"

This reverts commit 1b20b539a7ec0974753c258bd050d6cc1febbde0.