diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/product/ProductController.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/product/ProductController.java
index 2682a471295377f85e6229039e905d5194ebf60a..b7755e34186891752ec36cbc873b948d166e97dc 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/product/ProductController.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/product/ProductController.java
@@ -63,8 +63,13 @@ public class ProductController {
         Optional<List<String>> volumeUnit = productService.getProductVolume(productRequest.ean());
 
         if(volumeUnit.isPresent()){
-            product.setUnit(volumeUnit.get().get(1));
-            product.setAmount(Double.parseDouble(volumeUnit.get().get(0)));
+            if(volumeUnit.get().size() > 1){
+                product.setUnit(volumeUnit.get().get(1));
+                product.setAmount(Double.parseDouble(volumeUnit.get().get(0)));
+            }else {
+                product.setUnit("STK");
+                product.setAmount(1.0);
+            }
         }else {
             product.setUnit("STK");
             product.setAmount(1.0);