diff --git a/legacy/elementary/src/bin/test_layout.c b/legacy/elementary/src/bin/test_layout.c
index cb973a3ac5..d7cfd4c645 100644
--- a/legacy/elementary/src/bin/test_layout.c
+++ b/legacy/elementary/src/bin/test_layout.c
@@ -50,7 +50,7 @@ test_layout(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    ly = elm_layout_add(win);
    elm_layout_theme_set(ly, "layout", "application", "titlebar");
-   elm_object_text_set(ly, "Some title");
+   elm_object_part_text_set(ly, "elm.text", "Some title");
    evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(ly, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_box_pack_end(box, ly);
@@ -83,6 +83,7 @@ test_layout(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    bt = elm_button_add(win);
    elm_object_text_set(bt, "Button 2");
    elm_object_part_content_set(ly, "element2", bt);
+   //elm_object_part_content_set(ly, NULL, bt);
    evas_object_smart_callback_add(bt, "clicked", _clicked_cb, ly);
    evas_object_show(bt);
 
diff --git a/legacy/elementary/src/lib/elm_layout.c b/legacy/elementary/src/lib/elm_layout.c
index c30489e83d..fa4b585185 100644
--- a/legacy/elementary/src/lib/elm_layout.c
+++ b/legacy/elementary/src/lib/elm_layout.c
@@ -647,9 +647,7 @@ _elm_layout_part_aliasing_eval(const Evas_Object *obj EINA_UNUSED,
    else
      eo_do(sd->obj, elm_obj_layout_smart_content_aliases_get(&aliases));
 
-   if (!aliases) return EINA_TRUE;
-
-   while (aliases->alias && aliases->real_part)
+   while (aliases && aliases->alias && aliases->real_part)
      {
         /* NULL matches the 1st */
         if ((!*part) || (!strcmp(*part, aliases->alias)))