Fix google+ token null error. Make it a bit more secure