add better error handling for google pus