diff --git a/src/main/java/com/petshop/backend/service/InventoryService.java b/src/main/java/com/petshop/backend/service/InventoryService.java
index e144e67b..c601cf1a 100644
--- a/src/main/java/com/petshop/backend/service/InventoryService.java
+++ b/src/main/java/com/petshop/backend/service/InventoryService.java
@@ -111,8 +111,8 @@ public class InventoryService {
             inventory.getProduct().getId(),
             inventory.getProduct().getProductName(),
             inventory.getProduct().getCategory().getCategoryName(),
-            inventory.getStore().getId(),
-            inventory.getStore().getStoreName(),
+            inventory.getStore() != null ? inventory.getStore().getId() : null,
+            inventory.getStore() != null ? inventory.getStore().getStoreName() : null,
             inventory.getQuantity(),
             inventory.getReorderLevel(),
             inventory.getLastRestocked(),