diff --git a/local/recipes/wayland/libwayland/source/src/wayland-client.c b/local/recipes/wayland/libwayland/source/src/wayland-client.c
index 2464e7b75..e9ec661d4 100644
--- a/local/recipes/wayland/libwayland/source/src/wayland-client.c
+++ b/local/recipes/wayland/libwayland/source/src/wayland-client.c
@@ -646,10 +646,15 @@ wl_proxy_destroy(struct wl_proxy *proxy)
  * \memberof wl_proxy
  */
 WL_EXPORT int
-wl_proxy_add_listener(struct wl_proxy *proxy,
-		      void (**implementation)(void), void *data)
-{
-	if (proxy->flags & WL_PROXY_FLAG_WRAPPER)
+ wl_proxy_add_listener(struct wl_proxy *proxy,
+ 		      void (**implementation)(void), void *data)
+ {
++	if (!proxy) {
++		fprintf(stderr, "FATAL: wl_proxy_add_listener(NULL) — caller=%p impl=%p\n",
++		        __builtin_return_address(0), (void*)implementation);
++		abort();
++	}
+ 	if (proxy->flags & WL_PROXY_FLAG_WRAPPER)
 		wl_abort("Proxy %p is a wrapper\n", proxy);
 
 	if (proxy->object.implementation || proxy->dispatcher) {
diff --git a/local/recipes/wayland/redbear-compositor/source/src/main.rs b/local/recipes/wayland/redbear-compositor/source/src/main.rs
index 71c0b3cb7..8ad06db2e 100644
--- a/local/recipes/wayland/redbear-compositor/source/src/main.rs
+++ b/local/recipes/wayland/redbear-compositor/source/src/main.rs
@@ -728,6 +728,11 @@ impl Compositor {
                         let _version = read_u32(payload, &mut cursor)?;
                         let new_id = read_u32(payload, &mut cursor)?;
 
+                        eprintln!(
+                            "redbear-compositor: client {} binds '{}' -> id {}",
+                            client_id, iface, new_id
+                        );
+
                         let mut clients = self.clients.lock().unwrap();
                         if let Some(client) = clients.get_mut(&client_id) {
                             let type_id = match iface.as_str() {