diff --git a/libweston/compositor.c b/libweston/compositor.c
index 3a838ec7..ff3fa45b 100644
--- a/libweston/compositor.c
+++ b/libweston/compositor.c
@@ -2306,6 +2306,10 @@ weston_surface_destroy(struct weston_surface *surface)
 	struct weston_pointer_constraint *constraint, *next_constraint;
 	struct weston_paint_node *pnode, *pntmp;
 
+	if (!surface)
+		return;
+
+	assert(surface->ref_count > 0);
 	if (--surface->ref_count > 0)
 		return;