Upgrading from BitCoin

- cleanup error message consistency