2 files changed, 6 insertions, 3 deletions
diff --git a/src/cpl.cc b/src/cpl.cc
index ead592fd..2768e797 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -654,10 +654,13 @@ CPL::set_content_versions (vector<ContentVersion> v)
 }
 
 
-ContentVersion
+optional<ContentVersion>
 CPL::content_version () const
 {
-	DCP_ASSERT (!_content_versions.empty());
+	if (_content_versions.empty()) {
+		return optional<ContentVersion>();
+	}
+
 	return _content_versions[0];
 }
 
diff --git a/src/cpl.h b/src/cpl.h
index 72366ee3..c1f505df 100644
--- a/src/cpl.h
+++ b/src/cpl.h
@@ -140,7 +140,7 @@ public:
 		return _content_kind;
 	}
 
-	ContentVersion content_version () const;
+	boost::optional<ContentVersion> content_version () const;
 
 	std::vector<ContentVersion> content_versions () const {
 		return _content_versions;