diff --git a/dll/win32/msi/media.c b/dll/win32/msi/media.c
index cc4648481ba..af6e83b893e 100644
--- a/dll/win32/msi/media.c
+++ b/dll/win32/msi/media.c
@@ -507,16 +507,23 @@ static INT_PTR cabinet_close_file_info(FDINOTIFICATIONTYPE fdint,
     data->mi->is_continuous = FALSE;
 
     if (!DosDateTimeToFileTime(pfdin->date, pfdin->time, &ft))
+    {
+        CloseHandle(handle);
         return -1;
+    }
     if (!LocalFileTimeToFileTime(&ft, &ftLocal))
+    {
+        CloseHandle(handle);
         return -1;
+    }
     if (!SetFileTime(handle, &ftLocal, 0, &ftLocal))
+    {
+        CloseHandle(handle);
         return -1;
+    }
 
     CloseHandle(handle);
-
-    data->cb(data->package, data->curfile, MSICABEXTRACT_FILEEXTRACTED, NULL, NULL,
-             data->user);
+    data->cb(data->package, data->curfile, MSICABEXTRACT_FILEEXTRACTED, NULL, NULL, data->user);
 
     msi_free(data->curfile);
     data->curfile = NULL;