diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index a245f13..2e761c1 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -290,23 +290,39 @@ public class Controller {
   @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
   @RequestMapping("/api/getMyCaches")
   @ResponseBody
-  String getMyCaches(@RequestParam String token) {
-    User user = userRepository.findByUsername(token.substring(0, token.indexOf("$")));
-    ArrayList<Bearbeitet> bearbeitetList = new ArrayList<>();
+  ResponseEntity getMyCaches(@RequestParam String token) {
+    try {
+      User user = userRepository.findByUsername(token.substring(0, token.indexOf("$")));
+      ArrayList<Bearbeitet> bearbeitetList = new ArrayList<>();
 
-    for (Bearbeitet bearbeitet : bearbeitetRepository.findAll()) {
-      if (bearbeitet.getUser().getId() == user.getId()) {
-        bearbeitetList.add(bearbeitet);
+      for (Bearbeitet bearbeitet : bearbeitetRepository.findAll()) {
+        if (bearbeitet.getUser().getId() == user.getId()) {
+          bearbeitetList.add(bearbeitet);
+        }
       }
+      return ResponseEntity.status(200).body(new Gson().toJson(bearbeitetList));
+    } catch (Exception e) {
+      return ResponseEntity.status(404).body("User was not found in the database");
     }
-    return new Gson().toJson(bearbeitetList);
   }
 
   @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
   @RequestMapping("/api/getRankingList")
   @ResponseBody
-  String getRankingList() {
-    return new Gson().toJson(userRepository.getRankingList());
+  ResponseEntity getRankingList() {
+    return ResponseEntity.status(200).body(new Gson().toJson(userRepository.getRankingList()));
+  }
+
+  @CrossOrigin(origins = "http://localhost:8081") // only for dev purpose
+  @RequestMapping("/api/getUser")
+  @ResponseBody
+  ResponseEntity getUser(@RequestParam String token) {
+    try {
+      User user = userRepository.findByUsername(token.substring(0, token.indexOf("$")));
+      return ResponseEntity.status(200).body(new Gson().toJson(user));
+    } catch (Exception e) {
+      return ResponseEntity.status(404).body("User was not found in the database");
+    }
   }
 }