diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b2a6398c917163a1bdab896569a1392c8849157c..21db9fcd1d726bb7f079be991dff7e9d853670d5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,10 +42,8 @@ test:
     - docker
   image: "${CI_REGISTRY_IMAGE}/vospace-test-env"
   variables:
-    FILE_CATALOG_REPO_URL: "https://gitlab-ci-token:${CI_JOB_TOKEN}@www.ict.inaf.it/gitlab/ia2/vospace-file-catalog.git"
+    FILE_CATALOG_REPO_URL: "https://gitlab-ci-token:${CI_JOB_TOKEN}@www.ict.inaf.it/gitlab/vospace/vospace-file-catalog.git"
   script:
-    - pwd
-    - ls
     - git clone ${FILE_CATALOG_REPO_URL}
     - mvn clean test -Dinit_database_scripts_path=../../vospace-file-catalog
     - awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print "coverage=" 100*covered/instructions }' target/site/jacoco/jacoco.csv
diff --git a/src/main/java/it/inaf/oats/vospace/TapeService.java b/src/main/java/it/inaf/oats/vospace/AsyncTransferService.java
similarity index 78%
rename from src/main/java/it/inaf/oats/vospace/TapeService.java
rename to src/main/java/it/inaf/oats/vospace/AsyncTransferService.java
index 42e5c1c7ae9a523217fe0ab2949972b8de11b1c8..69e4a323bd74fc704ce7a9a9b1fa32b563400ed2 100644
--- a/src/main/java/it/inaf/oats/vospace/TapeService.java
+++ b/src/main/java/it/inaf/oats/vospace/AsyncTransferService.java
@@ -11,9 +11,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
-public class TapeService {
+public class AsyncTransferService {
 
-    private static final Logger LOG = LoggerFactory.getLogger(TapeService.class);
+    private static final Logger LOG = LoggerFactory.getLogger(AsyncTransferService.class);
 
     @Autowired
     private RabbitTemplate template;
@@ -25,6 +25,10 @@ public class TapeService {
             byte[] message = MAPPER.writeValueAsBytes(job);
             byte[] result = (byte[]) template.convertSendAndReceive("start_job_queue", message);
 
+            if (result == null) {
+                throw new IllegalStateException("Transfer service returned an empty response");
+            }
+
             LOG.trace("Tape transfer service answered:\n{}", new String(result));
 
             return MAPPER.readValue(result, JobSummary.class);
diff --git a/src/main/java/it/inaf/oats/vospace/JobService.java b/src/main/java/it/inaf/oats/vospace/JobService.java
index 749a4bac903298c81b599cff3fb7369b8ffd0a69..2f397b160636a428ec3ead255e9b4ac0a2d3a128 100644
--- a/src/main/java/it/inaf/oats/vospace/JobService.java
+++ b/src/main/java/it/inaf/oats/vospace/JobService.java
@@ -17,7 +17,7 @@ public class JobService {
     private UriService uriService;
 
     @Autowired
-    private TapeService tapeService;
+    private AsyncTransferService asyncTransfService;
 
     public enum JobType {
         pullToVoSpace,
@@ -58,7 +58,7 @@ public class JobService {
 
     private void handlePullToVoSpace(JobSummary job) {
         // TODO: check protocol
-        tapeService.startJob(job);
+        asyncTransfService.startJob(job);
     }
 
     private void handleVoSpaceUrlsListResult(JobSummary job) {
diff --git a/src/test/java/it/inaf/oats/vospace/TransferControllerTest.java b/src/test/java/it/inaf/oats/vospace/TransferControllerTest.java
index 2645cb36e98f8d17ce2c5f2b12cfc794755d0789..5dd3cb6af781e1cdb6ea77f18bd4af62ce12842c 100644
--- a/src/test/java/it/inaf/oats/vospace/TransferControllerTest.java
+++ b/src/test/java/it/inaf/oats/vospace/TransferControllerTest.java
@@ -55,7 +55,7 @@ public class TransferControllerTest {
     private NodeDAO nodeDao;
 
     @MockBean
-    private TapeService tapeService;
+    private AsyncTransferService tapeService;
 
     @Autowired
     private MockMvc mockMvc;