diff --git a/.changeset/slow-keys-provide.md b/.changeset/slow-keys-provide.md
new file mode 100644
index 000000000..a705307f0
--- /dev/null
+++ b/.changeset/slow-keys-provide.md
@@ -0,0 +1,8 @@
+---
+"druxt-blocks": patch
+"druxt": patch
+"druxt-entity": patch
+"druxt-views": patch
+---
+
+Fixed errors in storybook
diff --git a/packages/blocks/src/components/DruxtBlock.vue b/packages/blocks/src/components/DruxtBlock.vue
index 7b19293cb..202aa58af 100644
--- a/packages/blocks/src/components/DruxtBlock.vue
+++ b/packages/blocks/src/components/DruxtBlock.vue
@@ -91,6 +91,8 @@ export default {
      * @returns {ComponentOptions}
      */
     componentOptions: ({ block }) => {
+      if (!block) return []
+
       // Get Plugin and Plugin ID data.
       let plugin = block.attributes.plugin || ''
       let pluginId = null
diff --git a/packages/druxt/src/components/DruxtModule.vue b/packages/druxt/src/components/DruxtModule.vue
index 0f0a13b45..18ac1472c 100644
--- a/packages/druxt/src/components/DruxtModule.vue
+++ b/packages/druxt/src/components/DruxtModule.vue
@@ -225,7 +225,7 @@ export default {
       let components = []
       for (const set of options.filter(set => Array.isArray(set))) {
         const variants = []
-        components = [...components, ...set.map(item => {
+        components = [...components, ...set.filter((o) => o).map(item => {
           // Build array of name parts.
           const parts = variants.length ? [...variants[0].parts] : []
           parts.push(pascalCase(splitByCase(item)))
diff --git a/packages/entity/src/components/DruxtEntity.vue b/packages/entity/src/components/DruxtEntity.vue
index 1df760de7..fc61bd505 100644
--- a/packages/entity/src/components/DruxtEntity.vue
+++ b/packages/entity/src/components/DruxtEntity.vue
@@ -257,7 +257,7 @@ export default {
 
       // DruxtEntity[EntityType][ViewMode][SchemaType]
       [
-        ((schema || {}).resourceType || type).split('--').shift(),
+        (((schema || {}).resourceType || type) || '').split('--').shift(),
         ((schema || {}).config || {}).mode || mode,
         ((schema || {}).config || {}).schemaType || schemaType || 'view'
       ],
diff --git a/packages/entity/templates/druxt-entity-form.stories.js b/packages/entity/templates/druxt-entity-form.stories.js
index e1ae71689..2eff2365c 100644
--- a/packages/entity/templates/druxt-entity-form.stories.js
+++ b/packages/entity/templates/druxt-entity-form.stories.js
@@ -17,22 +17,22 @@ export default {
       action: 'reset',
     },
     mode: {
+      options: [<%= (options.displays || []).map((s) => `'${s}'`).join(', ') %>],
       control: {
         type: 'select',
-        options: [<%= (options.displays || []).map((s) => `'${s}'`).join(', ') %>],
       },
     },
     schemaType: {
+      options: ['view', 'form'],
       control: {
         type: 'select',
-        options: ['view', 'form'],
       },
     },
     type: {},
     uuid: {
+      options: [<%= (options.entities || []).map((o) => `'${o.id}'`).join(', ') %>],
       control: {
         type: 'select',
-        options: [<%= (options.entities || []).map((o) => `'${o.id}'`).join(', ') %>],
       },
     },
     value: {
diff --git a/packages/entity/templates/druxt-entity.stories.js b/packages/entity/templates/druxt-entity.stories.js
index c8fbf525e..3dcbb84e1 100644
--- a/packages/entity/templates/druxt-entity.stories.js
+++ b/packages/entity/templates/druxt-entity.stories.js
@@ -8,22 +8,27 @@ export default {
       action: 'input',
     },
     mode: {
+      options: [<%= (options.displays || []).map((s) => `'${s}'`).join(', ') %>],
       control: {
         type: 'select',
-        options: [<%= (options.displays || []).map((s) => `'${s}'`).join(', ') %>],
+      },
+    },
+    settings: {
+      control: {
+        type: 'object',
       },
     },
     schemaType: {
+      options: ['view', 'form'],
       control: {
         type: 'select',
-        options: ['view', 'form'],
       },
     },
     type: {},
     uuid: {
+      options: [<%= (options.entities || []).map((o) => `'${o.id}'`).join(', ') %>],
       control: {
         type: 'select',
-        options: [<%= (options.entities || []).map((o) => `'${o.id}'`).join(', ') %>],
       },
     },
     value: {
@@ -44,9 +49,9 @@ export default {
   },
 }
 
-const Template = (args, { argTypes }) => {
+const Template = (args) => {
   return {
-    props: Object.keys(argTypes),
+    props: Object.keys(args),
     template: '<DruxtEntity v-bind="$props" v-on="$props" />',
   }
 }
diff --git a/packages/views/templates/druxt-views.stories.js b/packages/views/templates/druxt-views.stories.js
index 549c8d6a2..38a35bcf4 100644
--- a/packages/views/templates/druxt-views.stories.js
+++ b/packages/views/templates/druxt-views.stories.js
@@ -5,9 +5,9 @@ export default {
   component: DruxtView,
   argTypes: {
     displayId: {
+      options: [<%= options.displays.map(({ id }) => `'${id}'`).join(', ') %>],
       control: {
         type: 'select',
-        options: [<%= options.displays.map(({ id }) => `'${id}'`).join(', ') %>]
       },
     },
   },