--- a/servlib/bundling/BPQBlockProcessor.cc	Thu Aug 18 12:30:38 2011 +0100
+++ b/servlib/bundling/BPQBlockProcessor.cc	Thu Aug 18 13:19:07 2011 +0100
@@ -95,10 +95,8 @@
     // payload and the received blocks). This places them "outside"
     // the original blocks.
 
-    if ( (const_cast<Bundle*>(bundle))->api_blocks()->
-            has_block(BundleProtocol::QUERY_EXTENSION_BLOCK) ) {
-
-        log_info_p(LOG, "BPQBlock found in API Block Vec => created locally");
+    if ( list == BlockInfo::LIST_API ) {
+        log_info_p(LOG, "Adding BPQBlock found in API Block Vec to xmit_blocks");
 
         ASSERT((*xmit_blocks)[0].type() == BundleProtocol::PRIMARY_BLOCK);
         xmit_blocks->insert(xmit_blocks->begin() + 1, BlockInfo(this, source));
@@ -106,10 +104,9 @@
 
         return BP_SUCCESS;
 
-    } else if ( (const_cast<Bundle*>(bundle))->recv_blocks().
-                has_block(BundleProtocol::QUERY_EXTENSION_BLOCK) ) {
+    } else if ( list == BlockInfo::LIST_RECEIVED ) {
 
-        log_info_p(LOG, "BPQBlock found in Recv Block Vec => created remotly");
+        log_info_p(LOG, "Adding BPQBlock found in Recv Block Vec to xmit_blocks");
 
         xmit_blocks->append_block(this, source);
         ASSERT(xmit_blocks->has_block(BundleProtocol::QUERY_EXTENSION_BLOCK));
@@ -119,7 +116,7 @@
 
     } else {
 
-        log_info_p(LOG, "BPQBlock not found in bundle");
+        log_err_p(LOG, "BPQBlock not found in bundle");
         return BP_FAIL;
     }
 }