update wallet to use new exceptions