Fix bugs and improve error handling#890

hobostay wants to merge 1 commit intopingdotgg:mainpingdotgg/t3code:mainfrom

hobostay:fix/bug-fixes-and-improvementshobostay/t3code:fix/bug-fixes-and-improvementsCopy head branch name to clipboard