diff --git a/src/app/client-preview/page.tsx b/src/app/client-preview/page.tsx
index d01ec63..8c667a5 100644
--- a/src/app/client-preview/page.tsx
+++ b/src/app/client-preview/page.tsx
@@ -60,13 +60,17 @@ export default async function ClientPreviewPage({
   const token = tokenParsed.data
   const copilotClient = new CopilotAPI(token)
   const tokenPayload = await copilotClient.getTokenPayload()
-  if (!tokenPayload || !tokenPayload.clientId || !tokenPayload.companyId) {
+  if (!tokenPayload) {
     console.info('Failing token payload', tokenPayload)
     throw new Error('Failed to parse token payload')
   }
   if (getPreviewMode(tokenPayload)) {
     return <NoPreviewSupport />
   }
+  if (!tokenPayload.clientId || !tokenPayload.companyId) {
+    console.info('Missing clientId or companyId in token payload', tokenPayload)
+    throw new Error('Failed to parse token payload')
+  }
 
   const clientId = z.string().uuid().parse(tokenPayload.clientId)