diff --git a/src/ClientServer/Config/Constants.cs b/src/ClientServer/Config/Constants.cs
index 71fa0dceb909a299ed3aeb6166501223003f130a..79be811721aa8b95f22067615175aed2061af56f 100644
--- a/src/ClientServer/Config/Constants.cs
+++ b/src/ClientServer/Config/Constants.cs
@@ -13,7 +13,7 @@ namespace ClientServer.Helpers
     /// </summary>
     public static class Constants
     {
-        public static string VersionString = "2.5.6";
+        public static string VersionString = "2.5.8";
 
         /// <summary>
         /// this is only set once at program.cs!!
diff --git a/src/ClientServer/Controllers/Core/Exercises/DoExerciseAfterSolution/DoExerciseAfterSolutionController.cs b/src/ClientServer/Controllers/Core/Exercises/DoExerciseAfterSolution/DoExerciseAfterSolutionController.cs
index fe94152a9d3f4b7364f111a4217de2b76851561f..5df260b90727319ed67abbf1a5a4674efd848f6c 100644
--- a/src/ClientServer/Controllers/Core/Exercises/DoExerciseAfterSolution/DoExerciseAfterSolutionController.cs
+++ b/src/ClientServer/Controllers/Core/Exercises/DoExerciseAfterSolution/DoExerciseAfterSolutionController.cs
@@ -864,14 +864,30 @@ namespace ClientServer.Controllers.Core.Exercises.DoExerciseAfterSolution
                 return;
             }
 
-            if (solution?.Assessment == null)
+            if (afterSolution == null)
+            {
+                await
+                    Response.WriteAsync(
+                        Jc.Serialize(new BasicResponse(ResponseCode.NotFound, "after solution not found")));
+                return;
+            }
+            
+            if (solution == null)
             {
-                //this can happen if the solution assessment has started but has not yet finished...
                 await
                     Response.WriteAsync(
-                        Jc.Serialize(new BasicResponse(ResponseCode.NotFound, "solution or assessment not found")));
+                        Jc.Serialize(new BasicResponse(ResponseCode.NotFound, "solution not found")));
                 return;
             }
+            
+            if (solution.Assessment == null)
+            {
+                //this can happen if the solution assessment has started but has not yet finished...
+//                await
+//                    Response.WriteAsync(
+//                        Jc.Serialize(new BasicResponse(ResponseCode.NotFound, "solution or assessment not found")));
+//                return;
+            }
 
             var submitTests = _context.Tests
                     .Where(p => p.IsSubmitTest == true &&
diff --git a/src/ClientServer/Controllers/Core/Exercises/DoExerciseController.cs b/src/ClientServer/Controllers/Core/Exercises/DoExerciseController.cs
index 451e0915f6e16be4e42c237bbe2eff40582e0db3..c4ec07b1c073308ce42926b71cd7cfd12eb87947 100644
--- a/src/ClientServer/Controllers/Core/Exercises/DoExerciseController.cs
+++ b/src/ClientServer/Controllers/Core/Exercises/DoExerciseController.cs
@@ -1169,14 +1169,22 @@ namespace ClientServer.Controllers.Core.Exercises
                 return;
             }
 
-            if (solution?.Assessment == null)
+            if (solution == null)
             {
-                //this can happen if the solution assessment has started but has not yet finished...
                 await
                     Response.WriteAsync(
-                        Jc.Serialize(new BasicResponse(ResponseCode.NotFound, "solution or assessment not found")));
+                        Jc.Serialize(new BasicResponse(ResponseCode.NotFound, "solution not found")));
                 return;
             }
+            
+            if (solution?.Assessment == null)
+            {
+                //this can happen if the solution assessment has started but has not yet finished...
+//                await
+//                    Response.WriteAsync(
+//                        Jc.Serialize(new BasicResponse(ResponseCode.NotFound, "solution or assessment not found")));
+//                return;
+            }
 
             //check if assessment already run
             //var submitTestResults = _context.TestResults