diff --git a/wp-content/themes/ccat/app/components/nodes/TheLocation.vue b/wp-content/themes/ccat/app/components/nodes/TheLocation.vue
index 3fe04a6..3a75e30 100644
--- a/wp-content/themes/ccat/app/components/nodes/TheLocation.vue
+++ b/wp-content/themes/ccat/app/components/nodes/TheLocation.vue
@@ -8,4 +8,4 @@ defineProps<{ node: TheLocationFragment }>();
   <UPage>
     <UPageSection v-if="node.title" :title="node.title" />
   </UPage>
-</template>
\ No newline at end of file
+</template>
diff --git a/wp-content/themes/ccat/app/components/nodes/ThePage.vue b/wp-content/themes/ccat/app/components/nodes/ThePage.vue
index df27e80..824cb40 100644
--- a/wp-content/themes/ccat/app/components/nodes/ThePage.vue
+++ b/wp-content/themes/ccat/app/components/nodes/ThePage.vue
@@ -5,7 +5,5 @@ defineProps<{ node: ThePageFragment }>();
 </script>
 
 <template>
-  <UPage>
-    <TheSections :sections="node.groupPostPage?.sections" />
-  </UPage>
+  <TheSections :sections="node.groupPostPage?.sections || []" />
 </template>
diff --git a/wp-content/themes/ccat/app/components/sections/TheSections.vue b/wp-content/themes/ccat/app/components/sections/TheSections.vue
index 8bb5009..f5f44eb 100644
--- a/wp-content/themes/ccat/app/components/sections/TheSections.vue
+++ b/wp-content/themes/ccat/app/components/sections/TheSections.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import type { TheSectionFragment } from "#graphql-operations";
 
-const props = defineProps<{ sections: (TheSectionFragment)[] }>();
-const sections = props.sections.map(useSection);
+const props = defineProps<{ sections: (TheSectionFragment | null)[] }>();
+const sections = props.sections.filter(Boolean).map((section) => useSection(section!));
 </script>
 
 <template>
diff --git a/wp-content/themes/ccat/app/composables/useSection.ts b/wp-content/themes/ccat/app/composables/useSection.ts
index 37c4be0..b840b52 100644
--- a/wp-content/themes/ccat/app/composables/useSection.ts
+++ b/wp-content/themes/ccat/app/composables/useSection.ts
@@ -7,6 +7,6 @@ export function useSection(section: TheSectionFragment) {
     case "GroupAbstractBuilderSectionsTextBlockLayout":
       return { component: SectionTextBlock, attrs: attrs as SectionTextBlockFragment };
     default:
-      throw createError({ statusCode: 500, statusMessage: "Erreur interne", message: "Type de section invalide" });
+      throw createError({ statusCode: 500, statusMessage: "Erreur interne", message: `Type de section invalide: ${fieldGroupName}` });
   }
 }
diff --git a/wp-content/themes/ccat/app/layouts/default.vue b/wp-content/themes/ccat/app/layouts/default.vue
index b84d82f..160b643 100644
--- a/wp-content/themes/ccat/app/layouts/default.vue
+++ b/wp-content/themes/ccat/app/layouts/default.vue
@@ -7,7 +7,7 @@ watch(height, (h) => {
 </script>
 
 <template>
-  <div>
+  <div id="layout-default">
     <TheSiteHeaderTop />
     <TheSiteHeader />
     <div class="relative z-main bg-white border-b border-muted mb-[var(--footer-bottom-height)]">
diff --git a/wp-content/themes/ccat/app/pages/[...uri].vue b/wp-content/themes/ccat/app/pages/[...uri].vue
index fb23df7..69520da 100644
--- a/wp-content/themes/ccat/app/pages/[...uri].vue
+++ b/wp-content/themes/ccat/app/pages/[...uri].vue
@@ -5,7 +5,7 @@ useSeoMeta({ title: node?.title });
 </script>
 
 <template>
-  <div>
+  <div id="page-node-by-uri">
     <SiteBreadcrumbs :breadcrumbs="breadcrumbs" />
     <component :is="component" :node="node" />
   </div>