Tidy up error handling

[StevenMaude]

The way error handling works is a little ad hoc.

It's possible to return errors from the cli package's Actions, so we could do that instead of exiting immediately in this code.