diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index bb71436..8d169aa 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -1630,7 +1630,7 @@
 
 	weston_pointer_move(pointer, x, y);
 
-	if (!shsurf || !shsurf->resource)
+	if (!shsurf)
 		return;
 
 	weston_view_from_global_fixed(shsurf->view,
@@ -1665,8 +1665,9 @@
 
 	assert(shsurf);
 
-	wl_shell_surface_send_configure(shsurf->resource,
-					edges, width, height);
+	if (shsurf->resource)
+		wl_shell_surface_send_configure(shsurf->resource,
+						edges, width, height);
 }
 
 static const struct weston_shell_client shell_client = {
@@ -3514,7 +3515,8 @@
 
 	assert(shsurf);
 
-	xdg_surface_send_configure(shsurf->resource, width, height);
+	if (shsurf->resource)
+		xdg_surface_send_configure(shsurf->resource, width, height);
 }
 
 static const struct weston_shell_client xdg_client = {