diff --git a/lib/src/phy/phch/sch.c b/lib/src/phy/phch/sch.c
index 0968ac41a..c740659c9 100644
--- a/lib/src/phy/phch/sch.c
+++ b/lib/src/phy/phch/sch.c
@@ -541,7 +541,17 @@ static int decode_tb(srsran_sch_t*           q,
       par_tx = ((uint32_t)data[cb_segm->tbs / 8 + 0]) << 16 | ((uint32_t)data[cb_segm->tbs / 8 + 1]) << 8 |
                ((uint32_t)data[cb_segm->tbs / 8 + 2]);
 
-      if (par_rx == par_tx && par_rx) {
+      // Check if all the bytes are zeros
+      bool all_zeros = true;
+      for (uint32_t i = 0; i < cb_segm->tbs / 8 && all_zeros; i++) {
+        all_zeros = (data[i] == 0);
+      }
+      if (all_zeros) {
+        INFO("Error in TB decode: it is all zeros!");
+        return SRSRAN_ERROR;
+      }
+
+      if (par_rx == par_tx) {
         INFO("TB decoded OK");
         return SRSRAN_SUCCESS;
       } else {
diff --git a/lib/src/phy/phch/test/pdsch_test.c b/lib/src/phy/phch/test/pdsch_test.c
index f8ea93227..e13f96a48 100644
--- a/lib/src/phy/phch/test/pdsch_test.c
+++ b/lib/src/phy/phch/test/pdsch_test.c
@@ -150,7 +150,7 @@ static int check_softbits(srsran_pdsch_t*     pdsch_enb,
 
   if (!pdsch_ue->llr_is_8bit && !tb_cw_swap) {
     // Scramble
-    srsran_sequence_pdsch_apply_c(pdsch_ue->e[tb],
+    srsran_sequence_pdsch_apply_s(pdsch_ue->e[tb],
                                   pdsch_ue->e[tb],
                                   rnti,
                                   pdsch_cfg->grant.tb[tb].cw_idx,
@@ -168,6 +168,10 @@ static int check_softbits(srsran_pdsch_t*     pdsch_enb,
       rx_bytes[i] = w;
     }
     if (memcmp(pdsch_ue->e[tb], pdsch_enb->e[tb], pdsch_cfg->grant.tb[tb].nof_bits / 8) != 0) {
+      printf("tx=");
+      srsran_vec_fprint_byte(stdout, pdsch_enb->e[tb], pdsch_cfg->grant.tb[tb].nof_bits / 8);
+      printf("rx=");
+      srsran_vec_fprint_byte(stdout, pdsch_ue->e[tb], pdsch_cfg->grant.tb[tb].nof_bits / 8);
       ret = SRSRAN_ERROR;
     }
   }
@@ -195,6 +199,7 @@ int main(int argc, char** argv)
   srsran_chest_dl_res_t   chest_res;
   srsran_pdsch_res_t      pdsch_res[SRSRAN_MAX_CODEWORDS];
   srsran_random_t         random_gen = srsran_random_init(0x1234);
+  srsran_crc_t            crc_tb;
 
   /* Initialise to zeros */
   ZERO_OBJECT(softbuffers_tx);
@@ -212,6 +217,7 @@ int main(int argc, char** argv)
   ZERO_OBJECT(chest);
   ZERO_OBJECT(chest_res);
   ZERO_OBJECT(pdsch_res);
+  ZERO_OBJECT(crc_tb);
 
   parse_args(argc, argv);
 
@@ -384,11 +390,19 @@ int main(int argc, char** argv)
       }
     }
 
+    if (srsran_crc_init(&crc_tb, SRSRAN_LTE_CRC24A, 24) < SRSRAN_SUCCESS) {
+      ERROR("Error initiating CRC24A");
+      goto quit;
+    }
+
+    // Generate random data
     for (int tb = 0; tb < SRSRAN_MAX_CODEWORDS; tb++) {
       if (pdsch_cfg.grant.tb[tb].enabled) {
         for (int byte = 0; byte < pdsch_cfg.grant.tb[tb].tbs / 8; byte++) {
           data_tx[tb][byte] = (uint8_t)srsran_random_uniform_int_dist(random_gen, 0, 255);
         }
+        // Attach CRC for making sure TB with 0 CRC are detected
+        srsran_crc_attach_byte(&crc_tb, data_tx[tb], pdsch_cfg.grant.tb[tb].tbs - 24);
       }
     }
 
@@ -499,10 +513,12 @@ int main(int argc, char** argv)
   for (int tb = 0; tb < SRSRAN_MAX_CODEWORDS; tb++) {
     if (pdsch_cfg.grant.tb[tb].enabled) {
       if (check_softbits(&pdsch_tx, &pdsch_rx, &pdsch_cfg, subframe, tb)) {
-        printf("TB%d: The received softbits in subframe %d DO NOT match the encoded bits (crc=%d)\n",
-               tb,
-               subframe,
-               pdsch_res[tb].crc);
+        ERROR("TB%d: The received softbits in subframe %d DO NOT match the encoded bits (crc=%d)\n",
+              tb,
+              subframe,
+              pdsch_res[tb].crc);
+        ret = SRSRAN_ERROR;
+        goto quit;
       } else {
         for (int byte = 0; byte < pdsch_cfg.grant.tb[tb].tbs / 8; byte++) {
           if (data_tx[tb][byte] != data_rx[tb][byte]) {
diff --git a/lib/src/phy/phch/test/pusch_test.c b/lib/src/phy/phch/test/pusch_test.c
index d4c1a2bc8..7febc9b43 100644
--- a/lib/src/phy/phch/test/pusch_test.c
+++ b/lib/src/phy/phch/test/pusch_test.c
@@ -184,8 +184,10 @@ int main(int argc, char** argv)
   srsran_pusch_cfg_t     cfg;
   srsran_softbuffer_tx_t softbuffer_tx;
   srsran_softbuffer_rx_t softbuffer_rx;
+  srsran_crc_t           crc_tb;
 
   ZERO_OBJECT(uci_data_tx);
+  ZERO_OBJECT(crc_tb);
 
   bzero(&cfg, sizeof(srsran_pusch_cfg_t));
 
@@ -283,9 +285,12 @@ int main(int argc, char** argv)
     srsran_softbuffer_tx_reset(&softbuffer_tx);
     srsran_softbuffer_rx_reset(&softbuffer_rx);
 
+    // Generate random data
     for (uint32_t i = 0; i < cfg.grant.tb.tbs / 8; i++) {
       data[i] = (uint8_t)srsran_random_uniform_int_dist(random_h, 0, 255);
     }
+    // Attach CRC for making sure TB with 0 CRC are detected
+    srsran_crc_attach_byte(&crc_tb, data, cfg.grant.tb.tbs - 24);
 
     for (uint32_t a = 0; a < uci_data_tx.cfg.ack[0].nof_acks; a++) {
       uci_data_tx.value.ack.ack_value[a] = (uint8_t)srsran_random_uniform_int_dist(random_h, 0, 1);