diff --git a/src/Serializer.cc b/src/Serializer.cc
index 683b543e48..145aab3f4d 100644
--- a/src/Serializer.cc
+++ b/src/Serializer.cc
@@ -70,12 +70,8 @@ bool Serializer::StartSerialization(SerialInfo* info, const char* descr,
 
 bool Serializer::EndSerialization(SerialInfo* info)
 	{
-	ChunkedIO::Chunk* chunk = new ChunkedIO::Chunk;
-	chunk->len = format->EndWrite(&chunk->data);
-
 	if ( info->chunk )
 		{
-
 		if ( ! io->Write(info->chunk) )
 			{
 			Error(io->Error());
@@ -83,6 +79,9 @@ bool Serializer::EndSerialization(SerialInfo* info)
 			}
 		}
 
+	ChunkedIO::Chunk* chunk = new ChunkedIO::Chunk;
+	chunk->len = format->EndWrite(&chunk->data);
+
 	if ( ! io->Write(chunk) )
 		{
 		Error(io->Error());