3 files changed, 20 insertions, 4 deletions
diff --git a/src/zenserver/cache/httpstructuredcache.cpp b/src/zenserver/cache/httpstructuredcache.cpp
index 135eee57c..449a43653 100644
--- a/src/zenserver/cache/httpstructuredcache.cpp
+++ b/src/zenserver/cache/httpstructuredcache.cpp
@@ -727,7 +727,15 @@ HttpStructuredCacheService::HandleGetCacheRecord(HttpServerRequest& Request, con
 						if (IoBuffer Chunk = m_CidStore.FindChunkByCid(AttachmentHash.AsHash()))
 						{
 							CompressedBuffer Compressed = CompressedBuffer::FromCompressedNoValidate(std::move(Chunk));
-							Package.AddAttachment(CbAttachment(Compressed, AttachmentHash.AsHash()));
+							if (Compressed)
+							{
+								Package.AddAttachment(CbAttachment(Compressed, AttachmentHash.AsHash()));
+							}
+							else
+							{
+								ZEN_WARN("invalid compressed binary returned for {}", AttachmentHash.AsHash());
+								MissingCount++;
+							}
 						}
 						else
 						{
diff --git a/src/zenserver/projectstore/projectstore.cpp b/src/zenserver/projectstore/projectstore.cpp
index f5fecce24..45a96c60d 100644
--- a/src/zenserver/projectstore/projectstore.cpp
+++ b/src/zenserver/projectstore/projectstore.cpp
@@ -3431,9 +3431,16 @@ ProjectStore::Rpc(HttpServerRequest&	 HttpReq,
 				IoBuffer ChunkBuffer = m_CidStore.FindChunkByCid(RawHash);
 				if (ChunkBuffer)
 				{
-					ResponseWriter.AddHash(RawHash);
-					ResponsePackage.AddAttachment(
-						CbAttachment(CompressedBuffer::FromCompressedNoValidate(std::move(ChunkBuffer)), RawHash));
+					CompressedBuffer Compressed = CompressedBuffer::FromCompressedNoValidate(std::move(ChunkBuffer));
+					if (Compressed)
+					{
+						ResponseWriter.AddHash(RawHash);
+						ResponsePackage.AddAttachment(CbAttachment(std::move(Compressed), RawHash));
+					}
+					else
+					{
+						ZEN_WARN("invalid compressed binary in cas store for {}", RawHash);
+					}
 				}
 			}
 			ResponseWriter.EndArray();
diff --git a/src/zenserver/projectstore/zenremoteprojectstore.cpp b/src/zenserver/projectstore/zenremoteprojectstore.cpp
index cec68111f..679c344c6 100644
--- a/src/zenserver/projectstore/zenremoteprojectstore.cpp
+++ b/src/zenserver/projectstore/zenremoteprojectstore.cpp
@@ -119,6 +119,7 @@ public:
 					IoHash			 RawHash;
 					uint64_t		 RawSize;
 					CompressedBuffer Compressed = CompressedBuffer::FromCompressed(Chunk, RawHash, RawSize);
+					ZEN_ASSERT(Compressed);
 					RequestWriter.AddHash(RawHash);
 					RequestPackage.AddAttachment(CbAttachment(Compressed, RawHash));
 				}