diff --git a/autotests/kerfuffle/data/testdirwithemptysubdir_1.rar b/autotests/kerfuffle/data/testdirwithemptysubdir_1.rar
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/plugins/cli7zplugin/cliplugin.cpp b/plugins/cli7zplugin/cliplugin.cpp
--- a/plugins/cli7zplugin/cliplugin.cpp
+++ b/plugins/cli7zplugin/cliplugin.cpp
@@ -274,10 +274,16 @@
 
 bool CliPlugin::readExtractLine(const QString &line)
 {
-    QRegularExpression rx(QStringLiteral("ERROR: E_FAIL"));
+    const QRegularExpression rxUnknownError(QStringLiteral("ERROR: E_FAIL"));
+    const QRegularExpression rxBadCRC(QStringLiteral("ERROR: CRC Failed"));
 
-    if (rx.match(line).hasMatch()) {
-        emit error(i18n("Extraction failed."));
+    if (rxUnknownError.match(line).hasMatch()) {
+        emit error(i18n("Extraction failed due to an unknown error."));
+        return false;
+    }
+
+    if (rxBadCRC.match(line).hasMatch()) {
+        emit error(i18n("Extraction failed due to one or more corrupt files. Any extracted files may be damaged."));
         return false;
     }
 
diff --git a/plugins/clizipplugin/cliplugin.cpp b/plugins/clizipplugin/cliplugin.cpp
--- a/plugins/clizipplugin/cliplugin.cpp
+++ b/plugins/clizipplugin/cliplugin.cpp
@@ -192,18 +192,24 @@
 {
     const QRegularExpression rxUnsupCompMethod(QStringLiteral("unsupported compression method (\\d+)"));
     const QRegularExpression rxUnsupEncMethod(QStringLiteral("need PK compat. v\\d\\.\\d \\(can do v\\d\\.\\d\\)"));
+    const QRegularExpression rxBadCRC(QStringLiteral("bad CRC"));
 
     QRegularExpressionMatch unsupCompMethodMatch = rxUnsupCompMethod.match(line);
     if (unsupCompMethodMatch.hasMatch()) {
         emit error(i18n("Extraction failed due to unsupported compression method (%1).", unsupCompMethodMatch.captured(1)));
         return false;
     }
 
-    if (QRegularExpression(rxUnsupEncMethod).match(line).hasMatch()) {
+    if (rxUnsupEncMethod.match(line).hasMatch()) {
         emit error(i18n("Extraction failed due to unsupported encryption method."));
         return false;
     }
 
+    if (rxBadCRC.match(line).hasMatch()) {
+        emit error(i18n("Extraction failed due to one or more corrupt files. Any extracted files may be damaged."));
+        return false;
+    }
+
     return true;
 }