grim/convey

Clean up error handling the script/shell and add some unit tests
environment:
- source=global-override