diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/FridgeController.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/FridgeController.java
index 5739186b1615078320f2f84c61fe287df99a2787..9e6b1e31b141a0a31f242a63d443f6789019fd6b 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/FridgeController.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/group/FridgeController.java
@@ -9,6 +9,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.sql.Date;
+import java.util.Optional;
 
 /**
  * Controller for fridges API, providing endpoints for fridge management
@@ -61,22 +62,20 @@ public class FridgeController {
         long groupId = request.groupId();
         long productId = request.productId();
 
-        try {
-            fridgeService.getFridgeByGroupId(groupId).orElseThrow();
-        } catch (Exception e) {
+        Optional<Fridge> fridgeOpt = fridgeService.getFridgeByGroupId(groupId);
+        if (fridgeOpt.isEmpty()) {
             return ResponseEntity.notFound().build();
         }
 
         try {
-            if (fridgeService.addProductToFridge(groupId,productId, request.amount(), request.days()).isPresent()) {
-                return ResponseEntity.ok("Success");
-            }
-            return ResponseEntity.badRequest().body("Product already exists in the fridge");
+            fridgeService.addProductToFridge(groupId, productId, request.amount(), request.days());
+            return ResponseEntity.ok("Success");
         } catch (Exception e) {
             return ResponseEntity.status(500).body("Internal server error");
         }
     }
 
+
     /**
      * Removes a product from the fridge of a group
      * todo: remove the date parameter when the frontend is done