diff --git a/api/js/etemplate/Et2Select/Et2WidgetWithSelectMixin.ts b/api/js/etemplate/Et2Select/Et2WidgetWithSelectMixin.ts
index 76581d63d1..968ff714dd 100644
--- a/api/js/etemplate/Et2Select/Et2WidgetWithSelectMixin.ts
+++ b/api/js/etemplate/Et2Select/Et2WidgetWithSelectMixin.ts
@@ -15,7 +15,7 @@ import {cleanSelectOptions, find_select_options, SelectOption} from "./FindSelec
 import {SearchMixinInterface} from "./SearchMixin";
 
 /**
- * Base class for things that do selectbox type behaviour, to avoid putting too much or copying into read-only
+ * @summary Base class for things that do selectbox type behaviour, to avoid putting too much or copying into read-only
  * selectboxes, also for common handling of properties for more special selectboxes.
  *
  * As with most other widgets that extend Shoelace components, do not override render() without good reason.
@@ -53,6 +53,12 @@ type Constructor<T = {}> = new (...args : any[]) => T;
 
 export const Et2WidgetWithSelectMixin = <T extends Constructor<LitElement>>(superclass : T) =>
 {
+	/**
+	 * @summary Mixin for widgets where you can select from a pre-defined list of options
+	 *
+	 * Sample text
+	 *
+	 */
 	class Et2WidgetWithSelect extends Et2InputWidget(superclass)
 	{
 		/**
@@ -117,7 +123,6 @@ export const Et2WidgetWithSelectMixin = <T extends Constructor<LitElement>>(supe
 			return result;
 		}
 
-		/** @param {import('@lion/core').PropertyValues } changedProperties */
 		updated(changedProperties : PropertyValues)
 		{
 			super.updated(changedProperties);
diff --git a/api/js/etemplate/Et2Vfs/Et2VfsSelectDialog.ts b/api/js/etemplate/Et2Vfs/Et2VfsSelectDialog.ts
index fa2ed4583b..ec65b4a39f 100644
--- a/api/js/etemplate/Et2Vfs/Et2VfsSelectDialog.ts
+++ b/api/js/etemplate/Et2Vfs/Et2VfsSelectDialog.ts
@@ -47,7 +47,7 @@ import {Et2VfsPath} from "./Et2VfsPath";
  * @event change - Emitted when the control's value changes.
  *
  * @csspart toolbar - controls at the top
- * @csspart path
+ * @csspart path - Et2VfsPath control
  * @csspart listbox - The list of files
  * @csspart mimefilter - Mime filter select
  * @csspart form-control-help-text - The help text's wrapper.
diff --git a/doc/etemplate2/_includes/component.njk b/doc/etemplate2/_includes/component.njk
index 91ade69f4f..73725a119f 100644
--- a/doc/etemplate2/_includes/component.njk
+++ b/doc/etemplate2/_includes/component.njk
@@ -6,6 +6,9 @@
 {% set component = getComponent(component.tagName) %}
 
 {% block content %}
+  {# Avoid breaking if the component is not correct #}
+  {% if component and component.tagName %}
+
   {# Determine the badge variant #}
   {% if component.status == 'stable' %}
     {% set badgeVariant = 'primary' %}
@@ -324,4 +327,7 @@
       {% endfor %}
     </ul>
   {% endif %}
+      {% else %}
+        This component is not correctly documented
+      {% endif %}
 {% endblock %}