diff --git a/NorthBridge/NorthBridgeBusinessLogic/Implementations/ProductBusinessLogicContract.cs b/NorthBridge/NorthBridgeBusinessLogic/Implementations/ProductBusinessLogicContract.cs
index 28f348f..12ebe21 100644
--- a/NorthBridge/NorthBridgeBusinessLogic/Implementations/ProductBusinessLogicContract.cs
+++ b/NorthBridge/NorthBridgeBusinessLogic/Implementations/ProductBusinessLogicContract.cs
@@ -110,7 +110,7 @@ internal class ProductBusinessLogicContract(
         if (component == null) 
             throw new ArgumentNullException($"Component {componentOnStorage.ComponentId} not found");
 
-        if (componentOnStorage.Count == 0)
+        if (componentOnStorage.Count <= 0)
             throw new OutOfStockException(component.ComponentName);
 
         ComponentInProductDataModel componentInProduct = new ComponentInProductDataModel(component.Id, productId);
diff --git a/NorthBridge/NorthBridgeBusinessLogic/Implementations/StorageBusinessLogicContract .cs b/NorthBridge/NorthBridgeBusinessLogic/Implementations/StorageBusinessLogicContract .cs
index f20d0ec..2435f5d 100644
--- a/NorthBridge/NorthBridgeBusinessLogic/Implementations/StorageBusinessLogicContract .cs	
+++ b/NorthBridge/NorthBridgeBusinessLogic/Implementations/StorageBusinessLogicContract .cs	
@@ -73,6 +73,23 @@ namespace NorthBridgeBusinessLogic.Implementations
             _storageContract.UpdateComponentCount(storageId, componentId, newCount);
         }
 
+        public int GetComponentCountFromStorage(string componentId, string storageId)
+        {
+            var storage = _storageContract.GetStorageById(storageId);
+            var component = _storageContract.GetComponentOnStorage(storageId, componentId);
+
+            if (storage == null)
+            {
+                throw new ArgumentNullException("Storage not found");
+            }
+            if (component == null)
+            {
+                throw new ArgumentNullException("Component not found");
+            }
+
+            return component.Count;
+        }
+
         public List<ComponentOnStorageDataModel> GetComponentsFromStorage(string storageId)
         {
             var storage = _storageContract.GetStorageById(storageId);
diff --git a/NorthBridge/NorthBridgeContract/BusinessLogicsContracts/IStorageBusinessLogicContract.cs b/NorthBridge/NorthBridgeContract/BusinessLogicsContracts/IStorageBusinessLogicContract.cs
index 403e4d1..da784cf 100644
--- a/NorthBridge/NorthBridgeContract/BusinessLogicsContracts/IStorageBusinessLogicContract.cs
+++ b/NorthBridge/NorthBridgeContract/BusinessLogicsContracts/IStorageBusinessLogicContract.cs
@@ -17,6 +17,8 @@ namespace NorthBridgeContract.BusinessLogicsContracts
 
         void UpdateComponentCount(string storageId, string componentId, int newCount);
 
+        int GetComponentCountFromStorage(string componentId, string storageId);
+
         List<ComponentOnStorageDataModel> GetComponentsFromStorage(string storageId);
 
         StorageDataModel GetStorageById(string storageId);
diff --git a/NorthBridge/NorthBridgeContract/StoragesContracts/IStorageStorageContract.cs b/NorthBridge/NorthBridgeContract/StoragesContracts/IStorageStorageContract.cs
index 4a14f82..9b2f864 100644
--- a/NorthBridge/NorthBridgeContract/StoragesContracts/IStorageStorageContract.cs
+++ b/NorthBridge/NorthBridgeContract/StoragesContracts/IStorageStorageContract.cs
@@ -21,6 +21,8 @@ namespace NorthBridgeContract.StoragesContracts
 
         void UpdateComponentCount(string storageId, string componentId, int newCount);
 
+        ComponentOnStorageDataModel GetComponentOnStorage(string storageId, string componentId);
+
         List<ComponentOnStorageDataModel> GetComponentsOnStorage(string storageId);
     }
 
diff --git a/NorthBridge/NorthBridgeTest/BusinessLogicsContractsTests/ProductBusinessLogicTests.cs b/NorthBridge/NorthBridgeTest/BusinessLogicsContractsTests/ProductBusinessLogicTests.cs
index 6d4148a..4c967b3 100644
--- a/NorthBridge/NorthBridgeTest/BusinessLogicsContractsTests/ProductBusinessLogicTests.cs
+++ b/NorthBridge/NorthBridgeTest/BusinessLogicsContractsTests/ProductBusinessLogicTests.cs
@@ -199,6 +199,39 @@ namespace NorthBridgeTest.BusinessLogicsContractsTests
             Assert.That(() => _productBusinessLogicContract.DeleteProduct(id), Throws.TypeOf<ArgumentNullException>());
             _productStorageContract.Verify(x => x.DelElement(It.IsAny<string>()), Times.Never);
         }
+
+        [Test]
+        public void AddComponentToProduct_SuccessfullyAddsComponent()
+        {
+            // Arrange
+            string productId = Guid.NewGuid().ToString();
+            string componentId = Guid.NewGuid().ToString();
+            string storageId = Guid.NewGuid().ToString();
+            var count = 5;
+
+            var componentOnStorage = new ComponentOnStorageDataModel(storageId, componentId, count);
+
+            var component = new ComponentDataModel(
+                componentId,
+                "RAM",
+                ComponentType.RAM,
+                Guid.NewGuid().ToString(),
+                100.50,
+                false
+            );
+
+            _componentStorageContract
+                .Setup(cs => cs.GetElementById(componentId))
+                .Returns(component);
+
+            // Act
+            _productBusinessLogicContract.AddComponentToProduct(componentOnStorage, productId);
+
+            // Assert
+            _productStorageContract.Verify(ps => ps.AddComponentToProduct(
+                It.Is<ComponentInProductDataModel>(c => c.ComponentId == componentId && c.ProductId == productId)
+            ), Times.Once);
+        }
     }