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

This reverts commit 384a156cb1e7bc4a9e3797458e0dba0f0369c0d4.