Easier errored msg recovery

- [ ] [tests pass](...)
- [ ] [ppm tests pass](...)