diff --git a/vendor/webkul/marketplace-vendor-attribute-manager/Block/Adminhtml/Attribute/Edit/AbstractMain.php b/vendor/webkul/marketplace-vendor-attribute-manager/Block/Adminhtml/Attribute/Edit/AbstractMain.php
index a34afeca7..14909dc72 100755
--- a/vendor/webkul/marketplace-vendor-attribute-manager/Block/Adminhtml/Attribute/Edit/AbstractMain.php
+++ b/vendor/webkul/marketplace-vendor-attribute-manager/Block/Adminhtml/Attribute/Edit/AbstractMain.php
@@ -151,7 +151,7 @@ abstract class AbstractMain extends \Magento\Backend\Block\Widget\Form\Generic
         }
 
         $validationClass = sprintf(
-            'validate-code validate-length maximum-length-25 validate-no-html-tags'
+            'validate-code validate-length maximum-length-50 validate-no-html-tags'
         );
 
         $label = $attributeObj->getFrontendLabel();
@@ -176,7 +176,7 @@ abstract class AbstractMain extends \Magento\Backend\Block\Widget\Form\Generic
                 'label' => __('Attribute Code'),
                 'title' => __('Attribute Code'),
                 'note' => __(
-                    'Make sure you don\'t use spaces or more than 25 characters.'
+                    'Make sure you don\'t use spaces or more than 50 characters.'
                 ),
                 'class' => $validationClass,
                 'required' => true
@@ -287,7 +287,7 @@ abstract class AbstractMain extends \Magento\Backend\Block\Widget\Form\Generic
             ['form' => $this->getForm()]
         );
         $formData = $this->getattributeObject()->getData();
-        $formData['frontend_class'] = trim(preg_replace('/required/', '', $formData['frontend_class']));
+        $formData['frontend_class'] = trim(preg_replace('/required/', '', $formData['frontend_class'] ?? ''));
 
         $this->getForm()->addValues($formData);
         return parent::_initFormValues();
diff --git a/vendor/webkul/marketplace-vendor-attribute-manager/Controller/Adminhtml/Attribute/Edit.php b/vendor/webkul/marketplace-vendor-attribute-manager/Controller/Adminhtml/Attribute/Edit.php
index 119784555..1a9f8fbb7 100755
--- a/vendor/webkul/marketplace-vendor-attribute-manager/Controller/Adminhtml/Attribute/Edit.php
+++ b/vendor/webkul/marketplace-vendor-attribute-manager/Controller/Adminhtml/Attribute/Edit.php
@@ -64,6 +64,11 @@ class Edit extends Action
      */
     protected $vendorAssignGroupFactory;
 
+    /**
+     * @var int|string
+     */
+    protected $_entityTypeId = '';
+
     public function __construct(
         Context $context,
         PageFactory $resultPageFactory,
@@ -168,7 +173,7 @@ class Edit extends Action
                 return $resultRedirect->setPath('*/vendorattribute/index');
             }
 
-            $requiredCheck = $attributeModel->getFrontendClass();
+            $requiredCheck = $attributeModel->getFrontendClass() ?? [];
             $require = explode(' ', $requiredCheck);
             if (in_array('required', $require)) {
                 $attributeModel->setIsRequired(1);
diff --git a/vendor/webkul/marketplace-vendor-attribute-manager/Controller/Adminhtml/Attribute/Save.php b/vendor/webkul/marketplace-vendor-attribute-manager/Controller/Adminhtml/Attribute/Save.php
index 176fdaa1e..7e5e95c76 100755
--- a/vendor/webkul/marketplace-vendor-attribute-manager/Controller/Adminhtml/Attribute/Save.php
+++ b/vendor/webkul/marketplace-vendor-attribute-manager/Controller/Adminhtml/Attribute/Save.php
@@ -244,7 +244,7 @@ class Save extends Action
      */
     protected function validateAttributeCode($attributeCode)
     {
-        $pattern = '/^[a-z][a-z_0-9]{0,25}$/';
+        $pattern = '/^[a-z][a-z_0-9]{0,50}$/';
 
         if (strlen($attributeCode) < 0 || !preg_match($pattern, $attributeCode)) {
             $this->messageManager->addError(