diff --git a/src/lv_objx/lv_list.c b/src/lv_objx/lv_list.c
index 54fe16a260..9757c60b4f 100644
--- a/src/lv_objx/lv_list.c
+++ b/src/lv_objx/lv_list.c
@@ -316,7 +316,7 @@ void lv_list_set_single_mode(lv_obj_t * list, bool mode)
 void lv_list_set_btn_selected(lv_obj_t * list, lv_obj_t * btn)
 {
     LV_ASSERT_OBJ(list, LV_OBJX_NAME);
-    if(btn) LV_ASSERT_OBJ(list, "lv_btn");
+    if(btn) LV_ASSERT_OBJ(btn, "lv_btn");
 
     lv_list_ext_t * ext = lv_obj_get_ext_attr(list);
 
diff --git a/src/lv_objx/lv_objx_templ.c b/src/lv_objx/lv_objx_templ.c
index d23dcb46a8..37bce78717 100644
--- a/src/lv_objx/lv_objx_templ.c
+++ b/src/lv_objx/lv_objx_templ.c
@@ -62,12 +62,12 @@ lv_obj_t * lv_templ_create(lv_obj_t * par, const lv_obj_t * copy)
     /*Create the ancestor of template*/
     /*TODO modify it to the ancestor create function */
     lv_obj_t * new_templ = lv_ANCESTOR_create(par, copy);
-    lv_mem_assert(new_templ);
+    LV_ASSERT_MEM(new_templ);
     if(new_templ == NULL) return NULL;
 
     /*Allocate the template type specific extended data*/
     lv_templ_ext_t * ext = lv_obj_allocate_ext_attr(new_templ, sizeof(lv_templ_ext_t));
-    lv_mem_assert(ext);
+    LV_ASSERT_MEM(ext);
     if(ext == NULL) return NULL;
     if(ancestor_signal == NULL) ancestor_signal = lv_obj_get_signal_func(new_templ);
     if(ancestor_design == NULL) ancestor_design = lv_obj_get_design_func(new_templ);