Improved communication error handling