diff --git a/src/main/java/eu/hbp/mip/controllers/MiningApi.java b/src/main/java/eu/hbp/mip/controllers/MiningApi.java
index 790876e70174dcdf2be2e94968a3d2762c2278cb..3c5be8bfd2cf5b186d5bfbadcb1f391181e73735 100644
--- a/src/main/java/eu/hbp/mip/controllers/MiningApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/MiningApi.java
@@ -61,7 +61,11 @@ public class MiningApi {
             return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE).build();
         }
 
-        return ResponseEntity.ok(result.data().get());
+        if (result.error().nonEmpty()) {
+            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(result.error().get());
+        } else {
+            return ResponseEntity.ok(result.data().get());
+        }
     }
 
 }
diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
index 790b13b28620c56131b88521a7fe79a6021020d0..6de4a32f2a4e7c5b3735663481fb66e5d913c67f 100644
--- a/tests/docker-compose.yml
+++ b/tests/docker-compose.yml
@@ -59,7 +59,7 @@ services:
       - db
 
   sample_db_setup:
-    image: "hbpmip/sample-data-db-setup:0.4.1"
+    image: "hbpmip/sample-data-db-setup:0.5.0"
     container_name: "data-db-setup"
     restart: "no"
     networks: