diff --git a/src/window.c b/src/window.c
index 202048c..872a7a9 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1638,7 +1638,8 @@ void wUnmanageWindow(WWindow *wwin, Bool restore, Bool destroyed)
 
 void wWindowMap(WWindow *wwin)
 {
-	wm_backend->window_map(wwin->frame->core->window);
+	if (wwin->frame) /* Wayland: no frame window to map */
+		wm_backend->window_map(wwin->frame->core->window);
 	if (!wwin->flags.shaded) {
 		/* window will be remapped when getting MapNotify */
 		wm_backend->window_select_events(wwin->client_win,
@@ -1660,7 +1661,8 @@ void wWindowUnmap(WWindow *wwin)
 	wm_backend->window_unmap(wwin->client_win);
 	wm_backend->window_select_events(wwin->client_win, wwin->event_mask);
 
-	wm_backend->window_unmap(wwin->frame->core->window);
+	if (wwin->frame) /* Wayland: no frame window to unmap */
+		wm_backend->window_unmap(wwin->frame->core->window);
 }
 
 void wWindowSingleFocus(WWindow *wwin)