diff --git a/templates/vue/field-types/Timestamp/DateTimePicker/detail/render.hbs b/templates/vue/field-types/Timestamp/DateTimePicker/detail/render.hbs
index 92942f621..daaf01fd3 100644
--- a/templates/vue/field-types/Timestamp/DateTimePicker/detail/render.hbs
+++ b/templates/vue/field-types/Timestamp/DateTimePicker/detail/render.hbs
@@ -1 +1 @@
-{{{{raw}}}} {{ {{{{/raw}}}} new Date({{variable_to_read}} / 1000).toLocaleString() {{{{raw}}}} }} {{{{/raw}}}}
+{{{{raw}}}} {{ {{{{/raw}}}} {{variable_to_read}} ? new Date({{variable_to_read}} / 1000).toLocaleString() : 'Missing timestamp' {{{{raw}}}} }} {{{{/raw}}}}
diff --git a/templates/vue/field-types/bool/Checkbox/edit/imports.hbs b/templates/vue/field-types/bool/Checkbox/edit/imports.hbs
index ba87c0fa7..a8312f198 100644
--- a/templates/vue/field-types/bool/Checkbox/edit/imports.hbs
+++ b/templates/vue/field-types/bool/Checkbox/edit/imports.hbs
@@ -1,2 +1,2 @@
 import '@material/mwc-checkbox';
-impor '@material/mwc-formfield';
+import '@material/mwc-formfield';