--- a/servlib/bundling/BPQBlock.cc	Mon Aug 15 17:48:10 2011 +0100
+++ b/servlib/bundling/BPQBlock.cc	Mon Aug 15 18:14:59 2011 +0100
@@ -190,12 +190,6 @@
 /////////////////////////////////////////////////////
     ASSERT ( block != NULL );
 //    ASSERT ( block->data() != NULL );
-    // BPQ Kind must be 0 or 1
-    if ( *(block->data()) != 0 &&
-         *(block->data()) != 1 ) {
-        log_err_p(LOG, "BPQBlock::initialise: block->data() = %c(should be 0|1)",
-            *(block->data()));
-    }
 
     log_debug_p(LOG, "BPQBlock::initialise: block != NULL");
     log_debug_p(LOG, "BPQBlock::initialise: block->data() != NULL"); 
@@ -228,6 +222,13 @@
     log_debug_p(LOG, "BPQBlock::initialise: extracting buf");
     buf = block->data();
 
+    // BPQ Kind must be 0 or 1
+    if ( *(block->data()) != 0 &&
+         *(block->data()) != 1 ) {
+        log_err_p(LOG, "BPQBlock::initialise: block->data() = %c(should be 0|1)",
+            *(block->data()));
+    }
+
     // BPQ-kind             1-byte
     if ( i < len ) {
         log_debug_p(LOG, "BPQBlock::initialise: extracting kind");