update work-flow branch with new error handling