=== modified file 'plugins/common/gsd-input-helper.c'
--- plugins/common/gsd-input-helper.c	2015-10-07 16:32:40 +0000
+++ plugins/common/gsd-input-helper.c	2016-05-19 09:25:18 +0000
@@ -595,7 +595,10 @@
         guint *value, w, h;
         int i, n_info;
 
+        /* ignore errors, device might be removed before config is done as in #1503758 */
+        gdk_error_trap_push();
         info = XIQueryDevice (GDK_DISPLAY_XDISPLAY (display), deviceid, &n_info);
+        gdk_error_trap_pop_ignored ();
         *width = *height = w = h = 0;
 
         if (!info)