diff --git a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/user/UserController.java b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/user/UserController.java
index 0edc6d6e07f392c6a38810895b439221861a017f..1b814c0186f5bed50a0b27ae739bd8d4f7093028 100644
--- a/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/user/UserController.java
+++ b/src/main/java/ntnu/idatt2016/v233/SmartMat/controller/user/UserController.java
@@ -100,9 +100,13 @@ public class UserController {
 
     @PostMapping("/addAllergy")
     public ResponseEntity<Boolean> addAllergyToUser(@RequestBody AllergyRequest allergyRequest) {
-        return userService.addAllergyToUser(allergyRequest.getUsername(), allergyRequest.getAllergyName())
-                .map(user -> ResponseEntity.ok(user.getAllergies().size() > 0))
-                .orElseGet(() -> ResponseEntity.notFound().build());
+        try {
+            return userService.addAllergyToUser(allergyRequest.getUsername(), allergyRequest.getAllergyName())
+                    .map(user -> ResponseEntity.ok(user.getAllergies().size() > 0))
+                    .orElseGet(() -> ResponseEntity.notFound().build());
+        }catch (Exception e){
+            return ResponseEntity.unprocessableEntity().body(false);
+        }
     }
 
     /**