Fix btc guild timeout errors
Improve error state handling
Improved error handling