diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/ModifyCommandRequest.java b/scm-core/src/main/java/sonia/scm/repository/spi/ModifyCommandRequest.java
index a108a73546..d61e17c785 100644
--- a/scm-core/src/main/java/sonia/scm/repository/spi/ModifyCommandRequest.java
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/ModifyCommandRequest.java
@@ -122,10 +122,12 @@ public class ModifyCommandRequest implements Resetable, Validateable {
     }
 
     void cleanup() {
-      try {
-        IOUtil.delete(content);
-      } catch (IOException e) {
-        LOG.warn("could not delete temporary file {}", content, e);
+      if (content.exists()) {
+        try {
+          IOUtil.delete(content);
+        } catch (IOException e) {
+          LOG.warn("could not delete temporary file {}", content, e);
+        }
       }
     }
   }