--- a/mobile/android/base/java/org/mozilla/gecko/dlc/DownloadAction.java
+++ b/mobile/android/base/java/org/mozilla/gecko/dlc/DownloadAction.java
@@ -210,45 +210,49 @@ public class DownloadAction extends Base
 
     protected OutputStream openFile(File file, boolean append) throws FileNotFoundException {
         return new BufferedOutputStream(new FileOutputStream(file, append));
     }
 
     protected void extract(File sourceFile, File destinationFile, String checksum)
             throws UnrecoverableDownloadContentException, RecoverableDownloadContentException {
         InputStream inputStream = null;
+        InputStream gzInputStream = null;
         OutputStream outputStream = null;
         File temporaryFile = null;
 
         try {
             File destinationDirectory = destinationFile.getParentFile();
             if (!destinationDirectory.exists() && !destinationDirectory.mkdirs()) {
                 throw new IOException("Destination directory does not exist and cannot be created");
             }
 
             temporaryFile = new File(destinationDirectory, destinationFile.getName() + ".tmp");
 
-            inputStream = new GZIPInputStream(new BufferedInputStream(new FileInputStream(sourceFile)));
+            // We have to have keep a handle to the BufferedInputStream: the GZIPInputStream
+            // constructor can fail e.g. if the stream isn't a GZIP stream. If we didn't keep
+            // a reference to that stream we wouldn't be able to close it if GZInputStream throws.
+            // (The BufferedInputStream constructor doesn't throw, so we don't need to care about it.)
+            inputStream = new BufferedInputStream(new FileInputStream(sourceFile));
+            gzInputStream = new GZIPInputStream(inputStream);
             outputStream = new BufferedOutputStream(new FileOutputStream(temporaryFile));
 
-            IOUtils.copy(inputStream, outputStream);
-
-            inputStream.close();
-            outputStream.close();
+            IOUtils.copy(gzInputStream, outputStream);
 
             if (!verify(temporaryFile, checksum)) {
                 Log.w(LOGTAG, "Checksum of extracted file does not match.");
                 return;
             }
 
             move(temporaryFile, destinationFile);
         } catch (IOException e) {
             // We could not extract to the destination: Keep temporary file and try again next time we run.
             throw new RecoverableDownloadContentException(RecoverableDownloadContentException.DISK_IO, e);
         } finally {
+            IOUtils.safeStreamClose(gzInputStream);
             IOUtils.safeStreamClose(inputStream);
             IOUtils.safeStreamClose(outputStream);
 
             if (temporaryFile != null && temporaryFile.exists()) {
                 temporaryFile.delete();
             }
         }
     }