diff --git a/src/main/java/eu/openaire/urls_controller/services/UrlsServiceImpl.java b/src/main/java/eu/openaire/urls_controller/services/UrlsServiceImpl.java
index 7f12958..a81ee04 100644
--- a/src/main/java/eu/openaire/urls_controller/services/UrlsServiceImpl.java
+++ b/src/main/java/eu/openaire/urls_controller/services/UrlsServiceImpl.java
@@ -516,23 +516,25 @@ public class UrlsServiceImpl implements UrlsService {
         // Rename the worker-report to indicate success or failure.
         String workerReportBaseName = this.workerReportsDirPath + File.separator + workerId + File.separator + workerId + "_assignments_" + assignmentRequestCounter + "_report";
         File workerReport = new File(workerReportBaseName + ".json");
-
-        // Check if the workerReport does not exist under this name, as it may have been renamed previously to "failed" and now is the 2nd try.
-        if ( ! workerReport.isFile() ) {
-            // Then this is the 2nd try and the report has already been renamed to "failed" the 1st time.
-            workerReport = new File(workerReportBaseName + "_failed.json");
-            if ( ! workerReport.isFile() ) {    // In this case, an error exists, since this file was deleted before its time.
-                logger.error("The workerReport file \""  + workerReport.getAbsolutePath() + "\" does not exist!");
-                // TODO - How to handle it? This report may be either successful or failed but the file was deleted.
-            }
-        }
-
-        File renamedWorkerReport = new File(workerReportBaseName + ((errorMsg == null) ? "_successful.json" : "_failed.json"));
+        File renamedWorkerReport = null;
         boolean wasWorkerReportRenamed = true;
         try {
-            if ( !workerReport.renameTo(renamedWorkerReport) ) {
-                logger.warn("There was a problem when renaming the workerReport: " + workerReport.getName());
-                wasWorkerReportRenamed = false;
+            // Check if the workerReport does not exist under this name, as it may have been renamed previously to "failed" and now is the 2nd try.
+            if ( !workerReport.isFile() ) {
+                // Then this is the 2nd try and the report has already been renamed to "failed" the 1st time.
+                workerReport = new File(workerReportBaseName + "_failed.json");
+                if ( !workerReport.isFile() ) {    // In this case, an error exists, since this file was deleted before its time.
+                    logger.error("The workerReport file \"" + workerReport.getAbsolutePath() + "\" does not exist!");
+                    wasWorkerReportRenamed = false; // Do not proceed on renaming the non-existing file.
+                    // TODO - Do we need additional handling? This report may be either successful or failed but the file was deleted.
+                }
+            }
+            if ( wasWorkerReportRenamed ) { // Only if the file exists.
+                renamedWorkerReport = new File(workerReportBaseName + ((errorMsg == null) ? "_successful.json" : "_failed.json"));
+                if ( !workerReport.renameTo(renamedWorkerReport) ) {
+                    logger.warn("There was a problem when renaming the workerReport: " + workerReport.getName());
+                    wasWorkerReportRenamed = false;
+                }
             }
         } catch (Exception e) {
             logger.error("There was a problem when renaming the workerReport: " + workerReport.getName(), e);