Improved BT error handling