diff --git a/src/configurable/commission.service.ts b/src/configurable/commission.service.ts
index 491e929..4b605a4 100644
--- a/src/configurable/commission.service.ts
+++ b/src/configurable/commission.service.ts
@@ -34,7 +34,7 @@ export class CommissionService {
         throw new HttpException(
           {
             statusCode: HttpStatus.NOT_FOUND,
-            error: 'Data not found',
+            error: 'Commission not found',
           },
           HttpStatus.NOT_FOUND,
         );
@@ -52,7 +52,7 @@ export class CommissionService {
         throw new HttpException(
           {
             statusCode: HttpStatus.NOT_FOUND,
-            error: 'Data not found',
+            error: 'Commission not found',
           },
           HttpStatus.NOT_FOUND,
         );
diff --git a/src/product/history-price/history-price.service.ts b/src/product/history-price/history-price.service.ts
index eb0a183..77e71bb 100644
--- a/src/product/history-price/history-price.service.ts
+++ b/src/product/history-price/history-price.service.ts
@@ -25,7 +25,7 @@ export class ProductHistoryPriceService {
         throw new HttpException(
           {
             statusCode: HttpStatus.NOT_FOUND,
-            error: 'Data not found',
+            error: 'Price not found',
           },
           HttpStatus.NOT_FOUND,
         );
diff --git a/src/product/product-categories.service.ts b/src/product/product-categories.service.ts
index d3c2cdc..6aa1e30 100644
--- a/src/product/product-categories.service.ts
+++ b/src/product/product-categories.service.ts
@@ -54,7 +54,7 @@ export class ProductCategoriesService {
         throw new HttpException(
           {
             statusCode: HttpStatus.NOT_FOUND,
-            error: 'Data not found',
+            error: 'Product Categories not found',
           },
           HttpStatus.NOT_FOUND,
         );
@@ -76,7 +76,7 @@ export class ProductCategoriesService {
         throw new HttpException(
           {
             statusCode: HttpStatus.NOT_FOUND,
-            error: 'Data not found',
+            error: 'Product Categories not found',
           },
           HttpStatus.NOT_FOUND,
         );
@@ -97,7 +97,7 @@ export class ProductCategoriesService {
         throw new HttpException(
           {
             statusCode: HttpStatus.NOT_FOUND,
-            error: 'Data not found',
+            error: 'Product Categories not found',
           },
           HttpStatus.NOT_FOUND,
         );
@@ -122,7 +122,7 @@ export class ProductCategoriesService {
         throw new HttpException(
           {
             statusCode: HttpStatus.NOT_FOUND,
-            error: 'Data not found',
+            error: 'Product Categories not found',
           },
           HttpStatus.NOT_FOUND,
         );
diff --git a/src/product/product-sub-categories.service.ts b/src/product/product-sub-categories.service.ts
index c6c3b8c..ffc0492 100644
--- a/src/product/product-sub-categories.service.ts
+++ b/src/product/product-sub-categories.service.ts
@@ -49,7 +49,7 @@ export class ProductSubCategoriesService {
       .createQueryBuilder('product_sub_categories')
       .leftJoinAndSelect('product_sub_categories.category', 'category');
 
-    if (category != 'null') {
+    if (category != 'null' && category) {
       baseQuery.where({
         category: category,
       });
@@ -90,7 +90,7 @@ export class ProductSubCategoriesService {
         throw new HttpException(
           {
             statusCode: HttpStatus.NOT_FOUND,
-            error: 'Data not found',
+            error: 'Product Sub Categories not found',
           },
           HttpStatus.NOT_FOUND,
         );
@@ -111,7 +111,7 @@ export class ProductSubCategoriesService {
         throw new HttpException(
           {
             statusCode: HttpStatus.NOT_FOUND,
-            error: 'Data not found',
+            error: 'Product Sub Categories not found',
           },
           HttpStatus.NOT_FOUND,
         );
@@ -140,7 +140,7 @@ export class ProductSubCategoriesService {
         throw new HttpException(
           {
             statusCode: HttpStatus.NOT_FOUND,
-            error: 'Data not found',
+            error: 'Product Sub Categories not found',
           },
           HttpStatus.NOT_FOUND,
         );
diff --git a/src/product/product.service.ts b/src/product/product.service.ts
index daef8a0..f459374 100644
--- a/src/product/product.service.ts
+++ b/src/product/product.service.ts
@@ -216,7 +216,7 @@ export class ProductService {
         throw new HttpException(
           {
             statusCode: HttpStatus.NOT_FOUND,
-            error: 'Data not found',
+            error: 'Product not found',
           },
           HttpStatus.NOT_FOUND,
         );
@@ -234,7 +234,7 @@ export class ProductService {
         throw new HttpException(
           {
             statusCode: HttpStatus.NOT_FOUND,
-            error: 'Data not found',
+            error: 'Product not found',
           },
           HttpStatus.NOT_FOUND,
         );
@@ -283,7 +283,7 @@ export class ProductService {
         throw new HttpException(
           {
             statusCode: HttpStatus.NOT_FOUND,
-            error: 'Data not found',
+            error: 'Product not found',
           },
           HttpStatus.NOT_FOUND,
         );
diff --git a/src/transaction/coa.service.ts b/src/transaction/coa.service.ts
index 33beffc..fac2a6e 100644
--- a/src/transaction/coa.service.ts
+++ b/src/transaction/coa.service.ts
@@ -66,7 +66,7 @@ export class CoaService {
         throw new HttpException(
           {
             statusCode: HttpStatus.NOT_FOUND,
-            error: 'Data not found',
+            error: 'COA not found',
           },
           HttpStatus.NOT_FOUND,
         );
diff --git a/src/users/supplier/supplier.service.ts b/src/users/supplier/supplier.service.ts
index 7a5155e..68bef24 100644
--- a/src/users/supplier/supplier.service.ts
+++ b/src/users/supplier/supplier.service.ts
@@ -164,7 +164,7 @@ export class SupplierService {
         throw new HttpException(
           {
             statusCode: HttpStatus.NOT_FOUND,
-            error: 'Data not found',
+            error: 'Supplier not found',
           },
           HttpStatus.NOT_FOUND,
         );
diff --git a/src/users/users.service.ts b/src/users/users.service.ts
index 4235e3f..38fb9e9 100644
--- a/src/users/users.service.ts
+++ b/src/users/users.service.ts
@@ -205,7 +205,7 @@ export class UsersService {
         throw new HttpException(
           {
             statusCode: HttpStatus.NOT_FOUND,
-            error: 'Data not found',
+            error: 'User not found',
           },
           HttpStatus.NOT_FOUND,
         );
@@ -228,7 +228,7 @@ export class UsersService {
         throw new HttpException(
           {
             statusCode: HttpStatus.NOT_FOUND,
-            error: 'Data not found',
+            error: 'User not found',
           },
           HttpStatus.NOT_FOUND,
         );
@@ -258,7 +258,7 @@ export class UsersService {
         throw new HttpException(
           {
             statusCode: HttpStatus.NOT_FOUND,
-            error: 'Data not found',
+            error: 'User not found',
           },
           HttpStatus.NOT_FOUND,
         );
@@ -276,7 +276,7 @@ export class UsersService {
         throw new HttpException(
           {
             statusCode: HttpStatus.NOT_FOUND,
-            error: 'Data not found',
+            error: 'User not found',
           },
           HttpStatus.NOT_FOUND,
         );
@@ -337,7 +337,7 @@ export class UsersService {
         throw new HttpException(
           {
             statusCode: HttpStatus.NOT_FOUND,
-            error: 'Data not found',
+            error: 'User not found',
           },
           HttpStatus.NOT_FOUND,
         );
@@ -371,7 +371,7 @@ export class UsersService {
         throw new HttpException(
           {
             statusCode: HttpStatus.NOT_FOUND,
-            error: 'Data not found',
+            error: 'User not found',
           },
           HttpStatus.NOT_FOUND,
         );