diff --git a/packages/app-store/_utils/oauth/getTokenObjectFromCredential.ts b/packages/app-store/_utils/oauth/getTokenObjectFromCredential.ts
index a0fde92305..935c596732 100644
--- a/packages/app-store/_utils/oauth/getTokenObjectFromCredential.ts
+++ b/packages/app-store/_utils/oauth/getTokenObjectFromCredential.ts
@@ -12,12 +12,14 @@ export function getTokenObjectFromCredential(credential: CredentialPayload) {
       "GoogleCalendarService-getTokenObjectFromCredential",
       safeStringify(parsedTokenResponse.error.issues)
     );
-    throw new Error("Could not parse credential.key");
+    throw new Error(
+      `Could not parse credential.key ${credential.id} with error: ${parsedTokenResponse?.error}`
+    );
   }
 
   const tokenResponse = parsedTokenResponse.data;
   if (!tokenResponse) {
-    throw new Error("credential.key is not set");
+    throw new Error(`credential.key is not set for credential ${credential.id}`);
   }
 
   return tokenResponse;