diff --git a/launcher/MMCZip.cpp b/launcher/MMCZip.cpp
index 265eb8b7a..33f5f88fc 100644
--- a/launcher/MMCZip.cpp
+++ b/launcher/MMCZip.cpp
@@ -510,6 +510,10 @@ bool ExportToZipTask::abort()
 
 void ExtractZipTask::executeTask()
 {
+    if (!m_input->isOpen() && !m_input->open(QuaZip::mdUnzip)) {
+        emitFailed(tr("Unable to open supplied zip file."));
+        return;
+    }
     m_zip_future = QtConcurrent::run(QThreadPool::globalInstance(), [this]() { return extractZip(); });
     connect(&m_zip_watcher, &QFutureWatcher<ZipResult>::finished, this, &ExtractZipTask::finish);
     m_zip_watcher.setFuture(m_zip_future);
diff --git a/launcher/java/download/ArchiveDownloadTask.cpp b/launcher/java/download/ArchiveDownloadTask.cpp
index 34f60260e..d62d4d8e2 100644
--- a/launcher/java/download/ArchiveDownloadTask.cpp
+++ b/launcher/java/download/ArchiveDownloadTask.cpp
@@ -35,7 +35,7 @@ void ArchiveDownloadTask::executeTask()
     // JRE found ! download the zip
     setStatus(tr("Downloading Java"));
 
-    MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("java", m_url.toLocalFile());
+    MetaEntryPtr entry = APPLICATION->metacache()->resolveEntry("java", m_url.fileName());
 
     auto download = makeShared<NetJob>(QString("JRE::DownloadJava"), APPLICATION->network());
     auto action = Net::Download::makeCached(m_url, entry);
@@ -70,12 +70,16 @@ void ArchiveDownloadTask::extractJava(QString input)
 {
     setStatus(tr("Extracting java"));
     auto zip = std::make_shared<QuaZip>(input);
+    if (!zip->open(QuaZip::mdUnzip)) {
+        emitFailed(tr("Unable to open supplied zip file."));
+        return;
+    }
     auto files = zip->getFileNameList();
     if (files.isEmpty()) {
         emitFailed("Empty archive");
         return;
     }
-    auto zipTask = makeShared<MMCZip::ExtractZipTask>(input, m_final_path, files[0]);
+    auto zipTask = makeShared<MMCZip::ExtractZipTask>(zip, m_final_path, files[0]);
 
     auto progressStep = std::make_shared<TaskStepProgress>();
     connect(zipTask.get(), &Task::finished, this, [this, progressStep] {