diff --git a/lib_com/bitstream.c b/lib_com/bitstream.c
index cff1f5b5e01ec4571539bf1b77c620395946f4fd..47fbbb9db21b89d728e4224aeb3de71ab332dd42 100644
--- a/lib_com/bitstream.c
+++ b/lib_com/bitstream.c
@@ -884,7 +884,11 @@ ivas_error check_ind_list_limits(
         }
         else
         {
+#ifdef DEBUGGING
             return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Buffer of indices corrupted in frame %d! Attempt to overwrite indice ID = %d (value: %d, bits: %d)!\n", frame, hBstr->ind_list[hBstr->nb_ind_tot].id, hBstr->ind_list[hBstr->nb_ind_tot].value, hBstr->ind_list[hBstr->nb_ind_tot].nb_bits );
+#else
+            return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Buffer of indices corrupted! Attempt to overwrite indice ID = %d (value: %d, bits: %d)!\n", hBstr->ind_list[hBstr->nb_ind_tot].id, hBstr->ind_list[hBstr->nb_ind_tot].value, hBstr->ind_list[hBstr->nb_ind_tot].nb_bits );
+#endif
         }
     }
 
@@ -939,7 +943,11 @@ ivas_error push_indice(
     /* check the limits of the list of indices */
     if ( ( error = check_ind_list_limits( hBstr ) ) != IVAS_ERR_OK )
     {
+#ifdef DEBUGGING
         return IVAS_ERROR( error, "Error occured in push_indice() while re-allocating the list of indices (frame %d) !\n", frame );
+#else
+        return IVAS_ERROR( error, "Error occured in push_indice() while re-allocating the list of indices!\n" );
+#endif
     }
 
     /* find the location in the list of indices based on ID */
@@ -1095,7 +1103,11 @@ ivas_error push_next_bits(
         /* check the limits of the list of indices */
         if ( ( error = check_ind_list_limits( hBstr ) ) != IVAS_ERR_OK )
         {
+#ifdef DEBUGGING
             return IVAS_ERROR( error, "Error occured in push_next_bits() while re-allocating the list of indices (frame %d) !\n", frame );
+#else
+            return IVAS_ERROR( error, "Error occured in push_next_bits() while re-allocating the list of indices!\n" );
+#endif
         }
         ptr = &hBstr->ind_list[hBstr->nb_ind_tot];
 
@@ -1114,7 +1126,11 @@ ivas_error push_next_bits(
         /* check the limits of the list of indices */
         if ( ( error = check_ind_list_limits( hBstr ) ) != IVAS_ERR_OK )
         {
+#ifdef DEBUGGING
             return IVAS_ERROR( error, "Error occured in push_next_bits() while re-allocating the list of indices (frame %d) !\n", frame );
+#else
+            return IVAS_ERROR( error, "Error occured in push_next_bits() while re-allocating the list of indices!\n" );
+#endif
         }
         ptr = &hBstr->ind_list[hBstr->nb_ind_tot];