diff --git a/lisp/files.el b/lisp/files.el
index 614cad467ef..be3c53951c4 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3183,9 +3183,8 @@ BACKUPNAME is the backup file name, which is the old file renamed."
 	  (set-default-file-modes ?\700)
 	  (while (condition-case ()
 		     (progn
-		       (condition-case nil
-			   (delete-file to-name)
-			 (file-error nil))
+		       (and (file-exists-p to-name)
+			    (delete-file to-name))
 		       (copy-file from-name to-name nil t)
 		       nil)
 		   (file-already-exists t))