Extract wallet and improved error reporting.