diff --git a/[refs] b/[refs]
index 948ba7dda27c..34ce08c38f30 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a64b44ead002ba15fdf841106a6fd344b8dd46d8
+refs/heads/master: 866af407dad3f2202e5d5d717ebd6156ccc33cdd
diff --git a/trunk/scripts/kconfig/nconf.c b/trunk/scripts/kconfig/nconf.c
index 762caf80ce37..2ba71bcd38e6 100644
--- a/trunk/scripts/kconfig/nconf.c
+++ b/trunk/scripts/kconfig/nconf.c
@@ -676,6 +676,8 @@ static void *item_data(void)
 	struct mitem *mcur;
 
 	cur = current_item(curses_menu);
+	if (!cur)
+		return NULL;
 	mcur = (struct mitem *) item_userptr(cur);
 	return mcur->usrptr;