diff --git a/src/modules/tiling/window_tree.c b/src/modules/tiling/window_tree.c
index 5f2bbfc5d..ac0592932 100644
--- a/src/modules/tiling/window_tree.c
+++ b/src/modules/tiling/window_tree.c
@@ -7,6 +7,9 @@ tiling_window_tree_walk(Window_Tree *root, void (*func)(void *))
 {
    Eina_Inlist *itr_safe;
    Window_Tree *itr;
+   if (!root)
+      return;
+
    EINA_INLIST_FOREACH_SAFE(root->children, itr_safe, itr)
      {
         tiling_window_tree_free(itr);