diff --git a/consistency_check/consistency.py b/consistency_check/consistency.py
index 3485304a29b..026f21162db 100755
--- a/consistency_check/consistency.py
+++ b/consistency_check/consistency.py
@@ -131,6 +131,8 @@ def compare_checksum(
     # Make a single DF with both info, and only keep pfn in both
     joined = pd.concat([fc_dump, se_dump], axis=1)
     joined = joined[joined.index.isin(in_both)]
+    if joined.empty:
+        raise ValueError("Could not join properly, is something wrong with the files format ?")
 
     # Filter on non matching checksum
     non_matching = joined.loc[joined["fc_cks"] != joined["se_cks"]][["seName", "lfn", "fc_cks", "se_cks"]]
diff --git a/src/DIRAC/DataManagementSystem/Agent/RequestOperations/RemoveFile.py b/src/DIRAC/DataManagementSystem/Agent/RequestOperations/RemoveFile.py
index ecc603b18c4..0d54b67501f 100644
--- a/src/DIRAC/DataManagementSystem/Agent/RequestOperations/RemoveFile.py
+++ b/src/DIRAC/DataManagementSystem/Agent/RequestOperations/RemoveFile.py
@@ -4,17 +4,17 @@
 # Date: 2013/03/25 07:44:19
 ########################################################################
 
-""" :mod: RemoveFile
+""":mod: RemoveFile
 
-    ================
+================
 
-    .. module: RemoveFile
+.. module: RemoveFile
 
-    :synopsis: removeFile operation handler
+:synopsis: removeFile operation handler
 
-    .. moduleauthor:: Krzysztof.Ciba@NOSPAMgmail.com
+.. moduleauthor:: Krzysztof.Ciba@NOSPAMgmail.com
 
-    removeFile operation handler
+removeFile operation handler
 """
 # #
 # @file RemoveFile.py
@@ -132,6 +132,7 @@ def __call__(self):
                     self.rmsMonitoringReporter.addRecord(
                         self.createRMSRecord("Successful", len(toRemoveDict) - len(bulkRemoval["Value"]))
                     )
+                toRemoveDict = bulkRemoval["Value"]
 
             # # 2nd step - single file removal
             for lfn, opFile in toRemoveDict.items():