Merge "Leave error handling the same as old workflow using dumpstate"