diff --git a/controllers/StockApiController.php b/controllers/StockApiController.php
index 86c54b91..9b0ec84e 100644
--- a/controllers/StockApiController.php
+++ b/controllers/StockApiController.php
@@ -278,14 +278,14 @@ class StockApiController extends BaseApiController
 			}
 
 			$specificStockEntryId = 'default';
-			if (array_key_exists('stock_entry_id', $requestBody) && !empty($requestBody['stock_entry_id']))
-			{
-				$specificStockEntryId = $requestBody['stock_entry_id'];
-			}
-			elseif (array_key_exists('stock_id', $args) && !empty($args['stock_id']))
+			if (array_key_exists('stock_id', $args) && !empty($args['stock_id']))
 			{
 				$specificStockEntryId = $args['stock_id'];
 			}
+			elseif (array_key_exists('stock_entry_id', $requestBody) && !empty($requestBody['stock_entry_id']))
+			{
+				$specificStockEntryId = $requestBody['stock_entry_id'];
+			}
 
 			$locationId = null;
 			if (array_key_exists('location_id', $requestBody) && !empty($requestBody['location_id']) && is_numeric($requestBody['location_id']))
@@ -326,6 +326,7 @@ class StockApiController extends BaseApiController
 	{
 		try
 		{
+			$barcode = $args['barcode'];
 			if (Grocycode::Validate($barcode))
 			{
 				$gc = new Grocycode($barcode);