diff --git a/client/CDocSupport.cpp b/client/CDocSupport.cpp
index 19cf47812..188aea386 100644
--- a/client/CDocSupport.cpp
+++ b/client/CDocSupport.cpp
@@ -88,6 +88,11 @@ CDocSupport::getCDocFileList(const QString &filename)
 			xml.skipCurrentElement();
 		}
 	}
+	if(xml.hasError()) {
+		// Malformed container, whatever was collected so far is incomplete
+		qWarning() << "Failed to parse" << filename << ":" << xml.errorString();
+		files.clear();
+	}
 
 	return files;
 }
diff --git a/client/libcdoc b/client/libcdoc
index 83408f9fc..838e4eb0e 160000
--- a/client/libcdoc
+++ b/client/libcdoc
@@ -1 +1 @@
-Subproject commit 83408f9fcf4af25e81d891c34f9cc437d23f021a
+Subproject commit 838e4eb0e4f17b79d95ff1d3e06ebc258ccf294a