Provide both possibilities of GoogleV3 HMAC
Minor exc cleanup