diff --git a/__tests__/core/CollectContainer.test.js b/__tests__/core/CollectContainer.test.js
index 10475cf..092a3fe 100644
--- a/__tests__/core/CollectContainer.test.js
+++ b/__tests__/core/CollectContainer.test.js
@@ -43,6 +43,20 @@ describe('test CollectConatiner Class', () => {
     expect(collectElement.getCardType()).toBe(CardType.DEFAULT);
   });
 
+  it('test create method sets containerType to COLLECT', () => {
+    const collectElement = collectContainer.create(
+      {
+        table: 'table1',
+        column: 'string1',
+        type: ElementType.PIN,
+      },
+      { required: false }
+    );
+    expect(collectElement).toBeInstanceOf(CollectElement);
+    const elementInput = collectElement.getElementInput();
+    expect(elementInput.containerType).toBe('COLLECT');
+  });
+
   it('test getContext method', () => {
     expect(collectContainer.getContext()).toEqual({
       env: Env.PROD,
diff --git a/__tests__/core/collectElement.test.js b/__tests__/core/collectElement.test.js
index f3a176b..d09bf9f 100644
--- a/__tests__/core/collectElement.test.js
+++ b/__tests__/core/collectElement.test.js
@@ -637,4 +637,122 @@ describe('test Collect Element class', () => {
       expect(collectElement.getInternalState().isValid).toBe(true);
     });
   });
+
+  it('test error messages for elements without label in COLLECT container', () => {
+    const pinElement = new CollectElement(
+      {
+        table: 'cards',
+        column: 'pin',
+        type: ElementType.PIN,
+        containerType: ContainerType.COLLECT,
+      },
+      { required: false },
+      context
+    );
+
+    pinElement.onChangeElement('12'); // Invalid PIN (less than 4 digits)
+    expect(pinElement.getInternalState().isValid).toBe(false);
+    expect(pinElement.getErrorText()).toBe(DEFAULT_COLLECT_ELEMENT_ERROR_TEXT); // Should be "Invalid value"
+
+    const cvvElement = new CollectElement(
+      {
+        table: 'cards',
+        column: 'cvv',
+        type: ElementType.CVV,
+        containerType: ContainerType.COLLECT,
+      },
+      { required: false },
+      context
+    );
+
+    cvvElement.onChangeElement('12'); // Invalid CVV
+    expect(cvvElement.getInternalState().isValid).toBe(false);
+    expect(cvvElement.getErrorText()).toBe(DEFAULT_COLLECT_ELEMENT_ERROR_TEXT); // Should be "Invalid value"
+  });
+
+  it('test error messages for elements without label in COMPOSABLE container', () => {
+    // Test PIN element without label in COMPOSABLE container
+    const pinElement = new CollectElement(
+      {
+        table: 'cards',
+        column: 'pin',
+        type: ElementType.PIN,
+        containerType: ContainerType.COMPOSABLE,
+      },
+      { required: false },
+      context
+    );
+
+    pinElement.onChangeElement('12'); // Invalid PIN (less than 4 digits)
+    expect(pinElement.getInternalState().isValid).toBe(false);
+    expect(pinElement.getErrorText()).toBe('Invalid pin'); // Should be element-specific error
+
+    const cvvElement = new CollectElement(
+      {
+        table: 'cards',
+        column: 'cvv',
+        type: ElementType.CVV,
+        containerType: ContainerType.COMPOSABLE,
+      },
+      { required: false },
+      context
+    );
+
+    cvvElement.onChangeElement('12'); // Invalid CVV
+    expect(cvvElement.getInternalState().isValid).toBe(false);
+    expect(cvvElement.getErrorText()).toBe('Invalid cvv'); // Should be element-specific error
+  });
+
+  it('test error messages for elements with label', () => {
+    // Test PIN element with label
+    const pinElement = new CollectElement(
+      {
+        table: 'cards',
+        column: 'pin',
+        type: ElementType.PIN,
+        label: 'PIN',
+        containerType: ContainerType.COLLECT,
+      },
+      { required: false },
+      context
+    );
+
+    pinElement.onChangeElement('12'); // Invalid PIN
+    expect(pinElement.getInternalState().isValid).toBe(false);
+    expect(pinElement.getErrorText()).toBe('Invalid PIN'); // Should use label
+
+    // Test required field with label when empty
+    const requiredElement = new CollectElement(
+      {
+        table: 'cards',
+        column: 'cvv',
+        type: ElementType.CVV,
+        label: 'CVV',
+        containerType: ContainerType.COLLECT,
+      },
+      { required: true },
+      context
+    );
+
+    requiredElement.onChangeElement(''); // Empty required field
+    expect(requiredElement.getInternalState().isValid).toBe(false);
+    expect(requiredElement.getErrorText()).toBe('CVV is required'); // Should use label with "is required"
+  });
+
+  it('test error messages for empty required fields without label', () => {
+    const element = new CollectElement(
+      {
+        table: 'cards',
+        column: 'pin',
+        type: ElementType.PIN,
+        containerType: ContainerType.COLLECT,
+      },
+      { required: true },
+      context
+    );
+
+    element.onChangeElement(''); // Empty required field
+    expect(element.getInternalState().isValid).toBe(false);
+    expect(element.getErrorText()).toBe('Field is required'); // Should be generic required message
+  });
 });
diff --git a/src/core/CollectContainer/index.ts b/src/core/CollectContainer/index.ts
index 5827b05..0282e62 100644
--- a/src/core/CollectContainer/index.ts
+++ b/src/core/CollectContainer/index.ts
@@ -45,7 +45,7 @@ class CollectContainer extends Container {
 
   create(elementInput: CollectElementInput, options?: any) {
     const element = new CollectElement(
-      elementInput,
+      { ...elementInput, containerType: ContainerType.COLLECT },
       options,
       this.getContext()
     );
diff --git a/src/core/CollectElement/index.ts b/src/core/CollectElement/index.ts
index 13bf271..9674999 100644
--- a/src/core/CollectElement/index.ts
+++ b/src/core/CollectElement/index.ts
@@ -358,7 +358,7 @@ class CollectElement extends SkyflowElement {
         ? DEFAULT_COLLECT_ELEMENT_REQUIRED_TEXT
         : this.#containerType === ContainerType.COLLECT
         ? DEFAULT_COLLECT_ELEMENT_ERROR_TEXT
-        : DEFAULT_ERROR_TEXT_ELEMENT_TYPES[this.#elementType];
+        : DEFAULT_ERROR_TEXT_ELEMENT_TYPES[this.#elementType] || DEFAULT_COLLECT_ELEMENT_ERROR_TEXT;
       this.hasError = true;
     } else {
       this.#errorText = '';