Google: Improved error handling