diff --git a/core/modules/layout_builder/css/layout-builder.css b/core/modules/layout_builder/css/layout-builder.css
index 11d8c55..ab11ea9 100644
--- a/core/modules/layout_builder/css/layout-builder.css
+++ b/core/modules/layout_builder/css/layout-builder.css
@@ -16,6 +16,10 @@
   padding: 1.5em 0;
 }

+.layout-section.error .layout-builder--layout__region {
+  outline-color: #da2f2f;
+}
+
 .layout-section .layout-builder--layout__region .add-block {
   text-align: center;
 }
diff --git a/core/modules/layout_builder/src/Controller/LayoutBuilderController.php b/core/modules/layout_builder/src/Controller/LayoutBuilderController.php
index 8f7666f..95b29fe 100644
--- a/core/modules/layout_builder/src/Controller/LayoutBuilderController.php
+++ b/core/modules/layout_builder/src/Controller/LayoutBuilderController.php
@@ -90,12 +90,25 @@ public function layout(SectionStorageInterface $section_storage, $is_rebuilding
     $this->prepareLayout($section_storage, $is_rebuilding);

     $output = [];
+    $missing_layout_ids = [];
     $count = 0;
     for ($i = 0; $i < $section_storage->count(); $i++) {
+
+      $section = $section_storage->getSection($count);
+      if (!$section->layoutExists() && !in_array($section->getLayoutId(), $missing_layout_ids)) {
+        $missing_layout_ids[] = $section->getLayoutId();
+      }
+
       $output[] = $this->buildAddSectionLink($section_storage, $count);
       $output[] = $this->buildAdministrativeSection($section_storage, $count);
       $count++;
     }
+
+    $message = t('The following layout(s) got renamed/deleted: ' . implode(' ', $missing_layout_ids) . '.<br> Please delete the sections below which have a red outline and rebuild your layout.');
+    if (!empty($missing_layout_ids)) {
+      $this->messenger->addMessage($message, 'warning');
+    }
+
     $output[] = $this->buildAddSectionLink($section_storage, $count);
     $output['#attached']['library'][] = 'layout_builder/drupal.layout_builder';
     $output['#type'] = 'container';
@@ -187,102 +200,109 @@ protected function buildAddSectionLink(SectionStorageInterface $section_storage,
    *   The render array for a given section.
    */
   protected function buildAdministrativeSection(SectionStorageInterface $section_storage, $delta) {
+    $error_class = NULL;
     $storage_type = $section_storage->getStorageType();
     $storage_id = $section_storage->getStorageId();
     $section = $section_storage->getSection($delta);
-
     $layout = $section->getLayout();
-    $build = $section->toRenderArray($this->getAvailableContexts($section_storage), TRUE);
     $layout_definition = $layout->getPluginDefinition();

-    foreach ($layout_definition->getRegions() as $region => $info) {
-      if (!empty($build[$region])) {
-        foreach ($build[$region] as $uuid => $block) {
-          $build[$region][$uuid]['#attributes']['class'][] = 'draggable';
-          $build[$region][$uuid]['#attributes']['data-layout-block-uuid'] = $uuid;
-          $build[$region][$uuid]['#contextual_links'] = [
-            'layout_builder_block' => [
-              'route_parameters' => [
-                'section_storage_type' => $storage_type,
-                'section_storage' => $storage_id,
-                'delta' => $delta,
-                'region' => $region,
-                'uuid' => $uuid,
+    if (!$section->layoutExists()) {
+      $error_class = 'error';
+    }
+
+    $build = $section->toRenderArray($this->getAvailableContexts($section_storage), TRUE);
+
+    if ($layout_definition) {
+      foreach ($layout_definition->getRegions() as $region => $info) {
+        if (!empty($build[$region])) {
+          foreach ($build[$region] as $uuid => $block) {
+            $build[$region][$uuid]['#attributes']['class'][] = 'draggable';
+            $build[$region][$uuid]['#attributes']['data-layout-block-uuid'] = $uuid;
+            $build[$region][$uuid]['#contextual_links'] = [
+              'layout_builder_block' => [
+                'route_parameters' => [
+                  'section_storage_type' => $storage_type,
+                  'section_storage' => $storage_id,
+                  'delta' => $delta,
+                  'region' => $region,
+                  'uuid' => $uuid,
+                ],
               ],
-            ],
-          ];
+            ];
+          }
         }
+
+        $build[$region]['layout_builder_add_block']['link'] = [
+          '#type' => 'link',
+          '#title' => $this->t('Add Block'),
+          '#url' => Url::fromRoute('layout_builder.choose_block',
+            [
+              'section_storage_type' => $storage_type,
+              'section_storage' => $storage_id,
+              'delta' => $delta,
+              'region' => $region,
+            ],
+            [
+              'attributes' => [
+                'class' => ['use-ajax'],
+                'data-dialog-type' => 'dialog',
+                'data-dialog-renderer' => 'off_canvas',
+              ],
+            ]
+          ),
+        ];
+        $build[$region]['layout_builder_add_block']['#type'] = 'container';
+        $build[$region]['layout_builder_add_block']['#attributes'] = ['class' => ['add-block']];
+        $build[$region]['layout_builder_add_block']['#weight'] = 1000;
+        $build[$region]['#attributes']['data-region'] = $region;
+        $build[$region]['#attributes']['class'][] = 'layout-builder--layout__region';
       }

-      $build[$region]['layout_builder_add_block']['link'] = [
-        '#type' => 'link',
-        '#title' => $this->t('Add Block'),
-        '#url' => Url::fromRoute('layout_builder.choose_block',
-          [
+      $build['#attributes']['data-layout-update-url'] = Url::fromRoute('layout_builder.move_block', [
+        'section_storage_type' => $storage_type,
+        'section_storage' => $storage_id,
+      ])->toString();
+      $build['#attributes']['data-layout-delta'] = $delta;
+      $build['#attributes']['class'][] = 'layout-builder--layout';
+
+      return [
+        '#type' => 'container',
+        '#attributes' => [
+          'class' => ['layout-section', $error_class],
+        ],
+        'configure' => [
+          '#type' => 'link',
+          '#title' => $this->t('Configure section'),
+          '#access' => $layout instanceof PluginFormInterface,
+          '#url' => Url::fromRoute('layout_builder.configure_section', [
             'section_storage_type' => $storage_type,
             'section_storage' => $storage_id,
             'delta' => $delta,
-            'region' => $region,
+          ]),
+          '#attributes' => [
+            'class' => ['use-ajax', 'configure-section'],
+            'data-dialog-type' => 'dialog',
+            'data-dialog-renderer' => 'off_canvas',
           ],
-          [
-            'attributes' => [
-              'class' => ['use-ajax'],
-              'data-dialog-type' => 'dialog',
-              'data-dialog-renderer' => 'off_canvas',
-            ],
-          ]
-        ),
-      ];
-      $build[$region]['layout_builder_add_block']['#type'] = 'container';
-      $build[$region]['layout_builder_add_block']['#attributes'] = ['class' => ['add-block']];
-      $build[$region]['layout_builder_add_block']['#weight'] = 1000;
-      $build[$region]['#attributes']['data-region'] = $region;
-      $build[$region]['#attributes']['class'][] = 'layout-builder--layout__region';
-    }
-
-    $build['#attributes']['data-layout-update-url'] = Url::fromRoute('layout_builder.move_block', [
-      'section_storage_type' => $storage_type,
-      'section_storage' => $storage_id,
-    ])->toString();
-    $build['#attributes']['data-layout-delta'] = $delta;
-    $build['#attributes']['class'][] = 'layout-builder--layout';
-
-    return [
-      '#type' => 'container',
-      '#attributes' => [
-        'class' => ['layout-section'],
-      ],
-      'configure' => [
-        '#type' => 'link',
-        '#title' => $this->t('Configure section'),
-        '#access' => $layout instanceof PluginFormInterface,
-        '#url' => Url::fromRoute('layout_builder.configure_section', [
-          'section_storage_type' => $storage_type,
-          'section_storage' => $storage_id,
-          'delta' => $delta,
-        ]),
-        '#attributes' => [
-          'class' => ['use-ajax', 'configure-section'],
-          'data-dialog-type' => 'dialog',
-          'data-dialog-renderer' => 'off_canvas',
         ],
-      ],
-      'remove' => [
-        '#type' => 'link',
-        '#title' => $this->t('Remove section'),
-        '#url' => Url::fromRoute('layout_builder.remove_section', [
-          'section_storage_type' => $storage_type,
-          'section_storage' => $storage_id,
-          'delta' => $delta,
-        ]),
-        '#attributes' => [
-          'class' => ['use-ajax', 'remove-section'],
-          'data-dialog-type' => 'dialog',
-          'data-dialog-renderer' => 'off_canvas',
+        'remove' => [
+          '#type' => 'link',
+          '#title' => $this->t('Remove section'),
+          '#url' => Url::fromRoute('layout_builder.remove_section', [
+            'section_storage_type' => $storage_type,
+            'section_storage' => $storage_id,
+            'delta' => $delta,
+          ]),
+          '#attributes' => [
+            'class' => ['use-ajax', 'remove-section'],
+            'data-dialog-type' => 'dialog',
+            'data-dialog-renderer' => 'off_canvas',
+          ],
         ],
-      ],
-      'layout-section' => $build,
-    ];
+        'layout-section' => $build,
+      ];
+    }
   }

   /**
diff --git a/core/modules/layout_builder/src/Section.php b/core/modules/layout_builder/src/Section.php
index 04b1cbb..9e738d1 100644
--- a/core/modules/layout_builder/src/Section.php
+++ b/core/modules/layout_builder/src/Section.php
@@ -75,6 +75,10 @@ public function __construct($layout_id, array $layout_settings = [], array $comp
    *   A renderable array representing the content of the section.
    */
   public function toRenderArray(array $contexts = [], $in_preview = FALSE) {
+    if (empty($this->getLayout())) {
+      return NULL;
+    }
+
     $regions = [];
     foreach ($this->getComponents() as $component) {
       if ($output = $component->toRenderArray($contexts, $in_preview)) {
@@ -92,7 +96,27 @@ public function toRenderArray(array $contexts = [], $in_preview = FALSE) {
    *   The layout plugin.
    */
   public function getLayout() {
-    return $this->layoutPluginManager()->createInstance($this->getLayoutId(), $this->getLayoutSettings());
+    $layout_id = $this->getLayoutId();
+    if (!$this->layoutPluginManager()->hasDefinition($this->getLayoutId())) {
+     $layout_id = 'layout_onecol';
+    }
+
+    return $this->layoutPluginManager()->createInstance($layout_id, $this->getLayoutSettings());
+  }
+
+  /**
+   * Check if a layout exists.
+   *
+   * @return boolean $layout_exists
+   *   Flag if the layout exists.
+   */
+  public function layoutExists() {
+    $layout_exists = TRUE;
+    if (!$this->layoutPluginManager()->hasDefinition($this->getLayoutId())) {
+     $layout_exists = FALSE;
+    }
+
+    return $layout_exists;
   }

   /**
@@ -141,6 +165,10 @@ public function setLayoutSettings(array $layout_settings) {
    *   The machine-readable name of the default region.
    */
   public function getDefaultRegion() {
+    if (!$this->layoutPluginManager()->hasDefinition($this->getLayoutId())) {
+      return NULL;
+    }
+
     return $this->layoutPluginManager()->getDefinition($this->getLayoutId())->getDefaultRegion();
   }