diff --git a/src/main/java/eu/hbp/mip/akka/ExperimentActor.java b/src/main/java/eu/hbp/mip/akka/ExperimentActor.java
index 21b415266c53694c7a6adebbe7093178f4a3f891..7431d7928e056a22c019dd5bb539b9e2c27a1cbc 100644
--- a/src/main/java/eu/hbp/mip/akka/ExperimentActor.java
+++ b/src/main/java/eu/hbp/mip/akka/ExperimentActor.java
@@ -47,6 +47,7 @@ public class ExperimentActor extends AbstractActor {
                 experiment.setHasServerError(true);
                 experiment.setResult(queryResult.error().get());
             } else {
+                // TODO: use new WokenConversions().toJson(queryResult)
                 experiment.setResult(queryResult.data().get().compactPrint());
             }
             experiment.setFinished(Date.from(queryResult.timestamp().toInstant()));
diff --git a/src/main/java/eu/hbp/mip/configuration/PortalErrorAttributes.java b/src/main/java/eu/hbp/mip/configuration/PortalErrorAttributes.java
index 0143c42ca373311452c3bde807c9a972e2bee674..aba509034c612cbb8335aadd451893c6a43ccee5 100644
--- a/src/main/java/eu/hbp/mip/configuration/PortalErrorAttributes.java
+++ b/src/main/java/eu/hbp/mip/configuration/PortalErrorAttributes.java
@@ -19,7 +19,13 @@ public class PortalErrorAttributes extends DefaultErrorAttributes {
         Map<String, Object> errorAttributes = super.getErrorAttributes(requestAttributes, includeStackTrace);
 
         Throwable throwable = getError(requestAttributes);
-        LOGGER.warn("Reporting server error", throwable);
+        StringBuilder sb = new StringBuilder("[");
+        for (String attr: requestAttributes.getAttributeNames(RequestAttributes.SCOPE_REQUEST)) {
+            Object v = requestAttributes.getAttribute(attr, RequestAttributes.SCOPE_REQUEST);
+            sb.append(attr).append(" = ").append(v).append('\n');
+        }
+        sb.append("]");
+        LOGGER.error("Reporting server error on request with attributes " + sb.toString(), throwable);
 
         if (throwable != null) {
 
diff --git a/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java b/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java
index d94514c6e78eda1e10c0db3459671dd2a3e770f8..caa8ea97be33dbb6773754c6ce37c6f2a609094e 100644
--- a/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java
@@ -272,7 +272,8 @@ public class ExperimentApi extends WokenClientController {
                         experiment.setHasServerError(true);
                         LOGGER.error("Experiment failed with message: " + queryResult.error().get());
                     }
-                    experiment.setResult(new WokenConversions().toJson(queryResult));
+                    // TODO: use new WokenConversions().toJson(queryResult)
+                    experiment.setResult(queryResult.data().get().compactPrint());
                     experiment.setFinished(Date.from(queryResult.timestamp().toInstant()));
                     experimentRepository.save(experiment);
                     LOGGER.info("Experiment " + uuid + " updated (finished)");
diff --git a/src/main/java/eu/hbp/mip/model/Experiment.java b/src/main/java/eu/hbp/mip/model/Experiment.java
index 4356ee7556154a1162ab2f2e79ed3f3b68f34532..8f4dd0a347a7e595742de1a0b9702163d4a0819b 100644
--- a/src/main/java/eu/hbp/mip/model/Experiment.java
+++ b/src/main/java/eu/hbp/mip/model/Experiment.java
@@ -309,7 +309,7 @@ public class Experiment {
             exp.remove("result");
 
             if (!isExaremeAlgorithm._1) {
-                JsonArray jsonResult = parser.parse(this.result).getAsJsonArray();
+                JsonElement jsonResult = parser.parse(this.result);
                 exp.add("result", jsonResult);
             } else {
                 JsonArray jsonArrayResult = new JsonArray();