- reworked error handling in workflow