Added GoogleToken and a little error handling