--- a/servlib/bundling/BPQBlockProcessor.cc	Thu Aug 18 11:30:52 2011 +0100
+++ b/servlib/bundling/BPQBlockProcessor.cc	Thu Aug 18 11:45:24 2011 +0100
@@ -102,6 +102,7 @@
 
         ASSERT((*xmit_blocks)[0].type() == BundleProtocol::PRIMARY_BLOCK);
         xmit_blocks->insert(xmit_blocks->begin() + 1, BlockInfo(this, source));
+        ASSERT(xmit_blocks->has_block(BundleProtocol::QUERY_EXTENSION_BLOCK));
 
         return BP_SUCCESS;
 
@@ -111,6 +112,7 @@
         log_info_p(LOG, "BPQBlock found in Recv Block Vec => created remotly");
 
         xmit_blocks->append_block(this, source);
+        ASSERT(xmit_blocks->has_block(BundleProtocol::QUERY_EXTENSION_BLOCK));
 
         return BP_SUCCESS;