diff --git a/src/main/java/it/inaf/oats/vospace/JobService.java b/src/main/java/it/inaf/oats/vospace/JobService.java
index 2f08d73972920e56421ef6ae9b6f3a4678d181fb..1d82eb48eff6624349e99e17cf20d9af6924ad75 100644
--- a/src/main/java/it/inaf/oats/vospace/JobService.java
+++ b/src/main/java/it/inaf/oats/vospace/JobService.java
@@ -65,12 +65,9 @@ public class JobService {
                     throw new UnsupportedOperationException("Not implemented yet");
             }
 
-            job.setPhase(ExecutionPhase.COMPLETED);
-
         } catch (VoSpaceErrorSummarizableException e) {
             job.setPhase(ExecutionPhase.ERROR);
             job.setErrorSummary(ErrorSummaryFactory.newErrorSummary(e.getFault()));
-        } finally {
             jobDAO.updateJob(job);
         }
     }
diff --git a/src/test/java/it/inaf/oats/vospace/TransferControllerTest.java b/src/test/java/it/inaf/oats/vospace/TransferControllerTest.java
index e59b314915acde93caff690554f3177d30d281d1..85fce66cc1981d25098af3a53fc204aa766f11c6 100644
--- a/src/test/java/it/inaf/oats/vospace/TransferControllerTest.java
+++ b/src/test/java/it/inaf/oats/vospace/TransferControllerTest.java
@@ -143,9 +143,9 @@ public class TransferControllerTest {
 
         verify(nodeDao, times(1)).setNodeLocation(eq("/portalnode"), eq(2), eq("lbcr.20130512.060722.fits.gz"));
 
-        verify(jobDao, times(2)).updateJob(argThat(j -> {
+        verify(jobDao, times(1)).updateJob(argThat(j -> {
             assertTrue(j.getResults().get(0).getHref().startsWith("http://archive.lbto.org"));
-            assertEquals(ExecutionPhase.COMPLETED, j.getPhase());
+            assertEquals(ExecutionPhase.EXECUTING, j.getPhase());
             return true;
         }));
     }
@@ -187,7 +187,7 @@ public class TransferControllerTest {
                 .andExpect(status().is3xxRedirection())
                 .andReturn().getResponse().getHeader("Location");
 
-        verify(jobDao, times(2)).updateJob(any());
+        verify(jobDao, times(1)).updateJob(any());
 
         assertThat(redirect, matchesPattern("^/transfers/.*"));
     }