diff --git a/lib/rdcu_compress/cmp_rdcu_cfg.c b/lib/rdcu_compress/cmp_rdcu_cfg.c
index 081633cd1cdba260b77444ab3853a7357ef5f84a..09ab8286482af1d4fd55979b699ea65657e5f8ab 100644
--- a/lib/rdcu_compress/cmp_rdcu_cfg.c
+++ b/lib/rdcu_compress/cmp_rdcu_cfg.c
@@ -45,9 +45,6 @@ static int rdcu_cfg_gen_pars_are_invalid(const struct rdcu_cfg *rcfg)
 {
 	int rcfg_invalid = 0;
 
-	if (!rcfg)
-		return 1;
-
 	if (!cmp_mode_is_supported(rcfg->cmp_mode)) {
 		debug_print("Error: selected cmp_mode: %i is not supported for a RDCU compression.", rcfg->cmp_mode);
 		rcfg_invalid++;
@@ -379,9 +376,6 @@ static int rdcu_cfg_imagette_is_invalid(const struct rdcu_cfg *rcfg)
 {
 	int rcfg_invalid = 0;
 
-	if (!rcfg)
-		return 1;
-
 	rcfg_invalid += rdcu_cfg_golomb_spill_are_invalid(rcfg->golomb_par, rcfg->spill,
 							 "imagette");
 	rcfg_invalid += rdcu_cfg_golomb_spill_are_invalid(rcfg->ap1_golomb_par, rcfg->ap1_spill,
diff --git a/test/cmp_entity/test_cmp_entity.c b/test/cmp_entity/test_cmp_entity.c
index de426075e2df8375b3720708d2f23a322575cd3f..8a01b0b51292e7fd136547384a7535780d06fbd7 100644
--- a/test/cmp_entity/test_cmp_entity.c
+++ b/test/cmp_entity/test_cmp_entity.c
@@ -1315,7 +1315,7 @@ void test_cmp_ent_get_data_buf(void)
 
 	/* RAW mode test */
 	for (data_type = DATA_TYPE_IMAGETTE;
-	     data_type <= DATA_TYPE_F_CAM_BACKGROUND;
+	     data_type <= DATA_TYPE_CHUNK;
 	     data_type++) {
 		s = cmp_ent_create(&ent, data_type, 1, 0);
 		TEST_ASSERT_NOT_EQUAL_INT(0, s);
diff --git a/test/cmp_rdcu_cfg/test_cmp_rdcu_cfg.c b/test/cmp_rdcu_cfg/test_cmp_rdcu_cfg.c
index 0c77be782a52914b6ba2f55f8031159d914ea064..06d524f0738633297575577b311bc1ca5e2f9774 100644
--- a/test/cmp_rdcu_cfg/test_cmp_rdcu_cfg.c
+++ b/test/cmp_rdcu_cfg/test_cmp_rdcu_cfg.c
@@ -91,6 +91,10 @@ void test_rdcu_cfg_create(void)
 	TEST_ASSERT_EQUAL(cmp_mode, rcfg.cmp_mode);
 	TEST_ASSERT_EQUAL(model_value, rcfg.model_value);
 	TEST_ASSERT_EQUAL(lossy_par, rcfg.round);
+
+	/* rcfg == NULL */
+	error = rdcu_cfg_create(NULL, cmp_mode, model_value, lossy_par);
+	TEST_ASSERT_TRUE(error);
 }