diff --git a/ui/src/components/layout/DefaultLayout.vue b/ui/src/components/layout/DefaultLayout.vue
index 739da19adf6..4d7cbff75f6 100644
--- a/ui/src/components/layout/DefaultLayout.vue
+++ b/ui/src/components/layout/DefaultLayout.vue
@@ -1,10 +1,8 @@
 <template>
     <left-menu v-if="configs" @menu-collapse="onMenuCollapse" />
     <main>
-        <slot v-if="!error" />
-        <template v-else>
-            Error: <errors :code="error" />
-        </template>
+        <errors v-if="error" :code="error" />
+        <slot v-else />
     </main>
     <context-info-bar v-if="configs" />
 </template>
diff --git a/ui/src/stores/core.js b/ui/src/stores/core.js
index 08d6b803a63..09c43df3065 100644
--- a/ui/src/stores/core.js
+++ b/ui/src/stores/core.js
@@ -59,5 +59,8 @@ export default {
         guidedProperties(state) {
             return state.guidedProperties;
         },
+        error(state) {
+            return state.error;
+        }
     }
 }