Rejig the error messages a bit; fixes a minor bug