diff --git a/ayanova/src/components/custom-fields-control.vue b/ayanova/src/components/custom-fields-control.vue
index ba82bdf6..bb24ac83 100644
--- a/ayanova/src/components/custom-fields-control.vue
+++ b/ayanova/src/components/custom-fields-control.vue
@@ -42,10 +42,17 @@ export default {
     //check pre-requisites exist just in case
     if (this.$gzdevmode()) {
       if (!this.$_) {
-        throw "tag-picker: $_ (lodash) is required and missing";
+        throw "custom-fields-control: $_ (lodash) is required and missing";
       }
       if (!this.$gzlocale) {
-        throw "tag-picker: $gzlocale is required and missing";
+        throw "custom-fields-control: $gzlocale is required and missing";
+      }
+      if (!this.formKey) {
+        throw "custom-fields-control: formKey property is required and missing";
+      }
+
+      if (!this.$store.state.formCustomTemplate[this.formKey]) {
+        throw "custom-fields-control: formCustomTemplate not in the Store!";
       }
     }
   }