diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index de6a1142492..946f45af76f 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -521,9 +521,15 @@ static void setTabletMode(GHOST_SystemX11 *system, GHOST_WindowX11 *window, XID
 #ifdef WITH_X11_XINPUT
 static bool checkTabletProximity(Display *display, XDevice *device)
 {
+	/* we could have true/false/not-found return value, but for now false is OK */
+
 	/* see: state.c from xinput, to get more data out of the device */
 	XDeviceState *state;
 
+	if (device == NULL) {
+		return false;
+	}
+
 	state = XQueryDeviceState(display, device);
 
 	if (state) {
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 82a6b784660..42ae9c12177 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1798,7 +1798,7 @@ static void widget_state_menu_item(uiWidgetType *wt, int state)
 	if ((state & UI_BUT_DISABLED) && (state & UI_ACTIVE)) {
 		widget_state_blend(wt->wcol.text, wt->wcol.text_sel, 0.5f);
 		/* draw the backdrop at low alpha, helps navigating with keys
-		 * when inactive items are active */
+		 * when disabled items are active */
 		copy_v4_v4_char(wt->wcol.inner, wt->wcol.inner_sel);
 		wt->wcol.inner[3] = 64;
 	}