1 files changed, 4 insertions, 6 deletions

diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index 554aa354c00..8985f751bb1 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -610,11 +610,9 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
                      (and (tramp-tramp-file-p filename)
                           (file-local-copy filename))))
               ;; Remote filename.
-              (condition-case err
+              (unwind-protect
                   (rename-file tmpfile newname ok-if-already-exists)
-                ((error quit)
-                 (delete-file tmpfile)
-                 (signal (car err) (cdr err))))
+                (delete-file tmpfile))
 
             ;; Remote newname.
             (when (and (file-directory-p newname)
@@ -852,7 +850,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
                     nil                  ;9 gid weird
                     inode                ;10 inode number
                     device))))           ;11 file system number
-        (remote-file-error (signal (car err) (cdr err)))
+        (remote-file-error (signal err))
         (error)))))
 
 (defun tramp-smb-do-file-attributes-with-stat (vec)
@@ -2125,7 +2123,7 @@ If ARGUMENT is non-nil, use it as argument for
                            (tramp-cleanup-connection vec t)
                            (tramp-smb-maybe-open-connection vec argument))
                        ;; Propagate the error.
-                       (signal (car err) (cdr err))))))))))))))
+                       (signal err)))))))))))))
 
 ;; We don't use timeouts.  If needed, the caller shall wrap around.
 (defun tramp-smb-wait-for-output (vec)