diff --git a/scripts/setup-gams.sh b/scripts/setup-gams.sh
index 64309e47..289f8181 100755
--- a/scripts/setup-gams.sh
+++ b/scripts/setup-gams.sh
@@ -19,7 +19,7 @@ apt-get install curl --yes
 # iisaa/gams-docker (https://github.com/iiasa/gams-docker/blob/master/Dockerfile, GPL-3.0 licensed)
 
 # Configure the GAMS version here
-GAMS_VERSION_RELEASE_MAJOR=49.7
+GAMS_VERSION_RELEASE_MAJOR=52.5
 GAMS_VERSION_HOTFIX=0
 
 # download the self-extracting archive to /opt/gams/gams.exe and run/extract it
diff --git a/src/test/java/edu/kit/provideq/toolbox/api/ApiTestHelper.java b/src/test/java/edu/kit/provideq/toolbox/api/ApiTestHelper.java
index 53511624..2d2abb1f 100644
--- a/src/test/java/edu/kit/provideq/toolbox/api/ApiTestHelper.java
+++ b/src/test/java/edu/kit/provideq/toolbox/api/ApiTestHelper.java
@@ -153,11 +153,18 @@ public static <InputT, ResultT> ProblemDto<InputT, ResultT> trySolveFor(
           })
           .returnResult()
           .getResponseBody();
-      builder.append("Fetched problem: " + problemDto + "\n");
 
+      if (problemDto == null) {
+        System.out.println("Testcase with id " + problemId
+            + " will terminate because problemDto is null");
+        System.out.println("problemType: " + problemType);
+      }
       assertNotNull(problemDto);
 
+      builder.append("Fetched problem: " + problemDto + "\n");
+
       if (problemDto.getState() == ProblemState.SOLVED) {
+        System.out.println(problemId + " solved successful.");
         break;
       }
 
@@ -174,6 +181,12 @@ public static <InputT, ResultT> ProblemDto<InputT, ResultT> trySolveFor(
               .getResponseBody();
           builder.append("Fetched sub problem: " + subProblemDto + "\n");
 
+          if (subProblemDto == null) {
+            System.out.println("Subproblem with id " + subProblemId
+                + " will terminate because subProblemDto is null");
+            System.out.println("subProblem: " + subProblem);
+            System.out.println("Log: " + builder);
+          }
           assertNotNull(subProblemDto);
         }
       }
@@ -187,6 +200,8 @@ public static <InputT, ResultT> ProblemDto<InputT, ResultT> trySolveFor(
       }
 
       if (hasTimeout.get()) {
+        System.out.println("Stopping testcase due to timeout.");
+        System.out.println("log: " + builder);
         throw new IllegalStateException("Problem did not solve in time: " + problemDto);
       }
     }