diff --git a/Api/OnlineSalesAutoCrop.CoreAPI.Models/Responses/MobileApp/MobileMasterDataResponse.cs b/Api/OnlineSalesAutoCrop.CoreAPI.Models/Responses/MobileApp/MobileMasterDataResponse.cs
index ca46f33..9c21f30 100644
--- a/Api/OnlineSalesAutoCrop.CoreAPI.Models/Responses/MobileApp/MobileMasterDataResponse.cs
+++ b/Api/OnlineSalesAutoCrop.CoreAPI.Models/Responses/MobileApp/MobileMasterDataResponse.cs
@@ -202,11 +202,11 @@ public class GetFOCMaterialResponse
     public string FOCCode { get; set; }
     public string CustomerCode { get; set; }
     public string MaterialCode { get; set; }
-    public string UnitOfMeasurement { get; set; }
-    public decimal MinimumOrderQty { get; set; }
-    public decimal ForQuantity { get; set; }
-    public decimal FreeQty { get; set; }
-    public string FOCUnitOfMeasurement { get; set; }
+    public string? UnitOfMeasurement { get; set; }
+    public decimal? MinimumOrderQty { get; set; }
+    public decimal? ForQuantity { get; set; }
+    public decimal? FreeQty { get; set; }
+    public string? FOCUnitOfMeasurement { get; set; }
     public DateTime StartDate { get; set; }
     public DateTime EndDate { get; set; }
 }
diff --git a/Api/OnlineSalesAutoCrop.CoreAPI.Services/Services/MobileApp/MobileMasterDataService.cs b/Api/OnlineSalesAutoCrop.CoreAPI.Services/Services/MobileApp/MobileMasterDataService.cs
index a8d3ad9..85907da 100644
--- a/Api/OnlineSalesAutoCrop.CoreAPI.Services/Services/MobileApp/MobileMasterDataService.cs
+++ b/Api/OnlineSalesAutoCrop.CoreAPI.Services/Services/MobileApp/MobileMasterDataService.cs
@@ -897,12 +897,12 @@ public class MobileMasterDataService : IMobileMasterDataService
                         {
                             FOCCode = dr.GetString(0),
                             CustomerCode = dr.GetString(1),
-                            MaterialCode = dr.GetString(2),
-                            UnitOfMeasurement = dr.GetString(3),
-                            MinimumOrderQty = dr.GetDecimal(4),
-                            ForQuantity = dr.GetDecimal(5),
-                            FreeQty = dr.GetDecimal(6),
-                            FOCUnitOfMeasurement = dr.GetString(7),
+                            MaterialCode = dr.IsDBNull(2)? null : dr.GetString(2),
+                            UnitOfMeasurement = dr.IsDBNull(3) ? null : dr.GetString(3),
+                            MinimumOrderQty = dr.IsDBNull(4) ? null : dr.GetDecimal(4),
+                            ForQuantity = dr.IsDBNull(5) ? null : dr.GetDecimal(5),
+                            FreeQty = dr.IsDBNull(6) ? null : dr.GetDecimal(6),
+                            FOCUnitOfMeasurement = dr.IsDBNull(7) ? null : dr.GetString(7),
                             StartDate = dr.GetDateTime(8),
                             EndDate = dr.GetDateTime(9),
                         });