diff --git a/src/main/java/DNPM/analyzer/AnalyzerUtils.java b/src/main/java/DNPM/analyzer/AnalyzerUtils.java
index 4a7e5a9..a3129fe 100644
--- a/src/main/java/DNPM/analyzer/AnalyzerUtils.java
+++ b/src/main/java/DNPM/analyzer/AnalyzerUtils.java
@@ -104,7 +104,7 @@ public class AnalyzerUtils {
      * @return <code>true</code>>, wenn ein Wert gefunden wurde, der dem RegExp entspricht
      */
     public static boolean requiredValueIsId(final Map<String, Object> input, final String key) {
-        return requiredValuePresent(input, key, Integer.class) && Integer.valueOf(input.get(key).toString()) > 0;
+        return requiredValuePresent(input, key, Integer.class) && Integer.parseInt(input.get(key).toString()) > 0;
     }
 
     /**
diff --git a/src/main/java/DNPM/analyzer/TherapieplanAnalyzer.java b/src/main/java/DNPM/analyzer/TherapieplanAnalyzer.java
index bdda750..e645925 100644
--- a/src/main/java/DNPM/analyzer/TherapieplanAnalyzer.java
+++ b/src/main/java/DNPM/analyzer/TherapieplanAnalyzer.java
@@ -118,12 +118,12 @@ public class TherapieplanAnalyzer implements IProcedureAnalyzer {
      * @return Liste mit Studien
      */
     public List<Studie> getStudien(Map<String, Object> input) {
-        var query = input.get("q");
+        var query = AnalyzerUtils.getRequiredValue(input, "q", String.class);
 
-        if (null == query || query.toString().isBlank()) {
+        if (query.isEmpty() || query.get().isBlank()) {
             return studienService.findAll();
         }
-        return studienService.findByQuery(query.toString());
+        return studienService.findByQuery(query.get());
     }
 
     /**
@@ -146,17 +146,16 @@ public class TherapieplanAnalyzer implements IProcedureAnalyzer {
      * @return Zeichenkette mit Protokollauszug
      */
     public String getProtokollauszug(Map<String, Object> input) {
-        var id = input.get("id");
+        var procedureId = AnalyzerUtils.getRequiredId(input, "id");
 
-        if (null == id || 0 == Integer.parseInt(id.toString())) {
+        if (procedureId.isEmpty()) {
             return "";
         }
 
-        var procedureId = Integer.parseInt(id.toString());
         return mtbService.getProtocol(
                 therapieplanServiceFactory
                         .currentUsableInstance()
-                        .findReferencedMtbs(procedureId)
+                        .findReferencedMtbs(procedureId.get())
         );
     }