Fix up error handling removing workflow dependency