adding some exception handling improvements
Merge branch 'master' of github.com:BitShares/bitshares_toolkit into upstream