diff --git a/tools/utils/atomic-write.go b/tools/utils/atomic-write.go
index 846a3f4da..aa22fb7c7 100644
--- a/tools/utils/atomic-write.go
+++ b/tools/utils/atomic-write.go
@@ -55,7 +55,11 @@ func AtomicWriteFile(path string, data io.Reader, perm os.FileMode) (err error)
 			if err == nil {
 				removed := false
 				defer func() {
-					f.Close()
+					if err == nil {
+						err = f.Close()
+					} else {
+						f.Close()
+					}
 					if !removed {
 						os.Remove(f.Name())
 						removed = true