Improve error reporting and fix bug where base currency values
presented.