Improve error messages slightly around running commands