diff --git a/src/test/features/UserShoppingByWear.feature b/src/test/features/UserShoppingByWear.feature
index 242d6ad..ed1a3a3 100644
--- a/src/test/features/UserShoppingByWear.feature
+++ b/src/test/features/UserShoppingByWear.feature
@@ -14,8 +14,8 @@ Feature: Verify that the user is able to purchase some item.
         And The details of the product are shown.
 
         Examples:
-            | Section  | Attire   |
-            | Men      | Shorts     |
+            | Section  | Attire      |
+            | Men      | Jackets     |
 
     @WomenShopping
     Scenario: User shops for Women Jackets.
diff --git a/src/test/pages/UserShoppingByWear.ts b/src/test/pages/UserShoppingByWear.ts
index 4ba791c..e3b90e5 100644
--- a/src/test/pages/UserShoppingByWear.ts
+++ b/src/test/pages/UserShoppingByWear.ts
@@ -84,29 +84,32 @@ import { Page, expect } from "@playwright/test";
     };
 
     public async selectRandomProduct():Promise<any>{
-        const getNumberOfProducts = await this.userShoppingByWearByWearLocators.productShown().count();
-        let ind: number = Math.floor(Math.random() * (getNumberOfProducts - 1))+ 1;
-        if (ind == 0) {
-            Math.floor(Math.random() * getNumberOfProducts);
-        } else {
-        const el = (pageFixture.page.locator(getResource('itemsShown').selectorValue.replace('FLAG', `${ind}`)));
-        await expect(el).toBeVisible();
-        await el.dblclick({force: true, timeout: 3000});
-        const list = await this.userShoppingByWearByWearLocators.shoppingList().isVisible();
-        const listCount = await this.userShoppingByWearByWearLocators.shoppingList().count();
-        if (list == true){
-            await pageFixture.logger.warn('User not navigated, retrying click');
-            await pageFixture.page.waitForLoadState('networkidle');
-            for(let i=0;i<listCount;i++){
-            await el.dblclick({force: true, timeout: 3000});
+        try {
+            const getNumberOfProducts = await this.userShoppingByWearByWearLocators.productShown().count();
+            let ind: number = Math.floor(Math.random() * getNumberOfProducts);
+            ind = Math.max(ind, 1);
+            const el = pageFixture.page.locator(getResource('itemsShown').selectorValue.replace('FLAG', `${ind}`));
+            await expect(el).toBeVisible();
+            await el.dblclick({ force: true, timeout: 3000 });
+            const listVisible = await this.userShoppingByWearByWearLocators.shoppingList().isVisible();
+            if (listVisible) {
+                await pageFixture.logger.warn('User not navigated, retrying click');
+                await pageFixture.page.waitForLoadState('networkidle');
+                const listCount = await this.userShoppingByWearByWearLocators.shoppingList().count();
+                for (let i = 0; i < listCount; i++) {
+                    await el.dblclick({ force: true, timeout: 3000 });
                 }
             } else {
-            await pageFixture.logger.info('User navigated successfully.')
-            };
-        };
-        const productName = await this.userShoppingByWearByWearLocators.pageTitle().innerText();
-        UserShoppingByWear.globalArray.push(productName)
-        return console.log('inside the selectRandomProductFunction', UserShoppingByWear.globalArray)
+                await pageFixture.logger.info('User navigated successfully.');
+            }
+            const productName = await this.userShoppingByWearByWearLocators.pageTitle().innerText();
+            UserShoppingByWear.globalArray.push(productName);
+            console.log('Selected random product: ', UserShoppingByWear.globalArray);
+            return productName;
+        } catch (error) {
+            await pageFixture.logger.error('Random product selection failed', error);
+            throw error;
+        }
     };
 
     public async getProductPriceAndSizes():Promise<void>{