diff --git a/Xi/xibarriers.c b/Xi/xibarriers.c
index b7c3393d4..bca99b3d3 100644
--- a/Xi/xibarriers.c
+++ b/Xi/xibarriers.c
@@ -727,6 +727,8 @@ static void add_master_func(void *res, XID id, void *devid)
 
 
     pbd = AllocBarrierDevice();
+    if (!pbd)
+        return;
     pbd->deviceid = *deviceid;
 
     input_lock();