diff --git a/ChangeLog b/ChangeLog
index 7ac85f53..b359c277 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
 	an addition a full refresh is needed (for multiline-regexes' sake),
 	instead of doing it always.
 	* src/color.c (reset_multis): Abort when having no multiline regexes.
+	* src/nano.c (do_input): A functionless shortcut should be impossible.
 
 2016-01-02  Benno Schulenberg  <bensberg@justemail.net>
 	* src/text.c (do_spell, do_formatter): Plug three tiny memory leaks.
diff --git a/src/nano.c b/src/nano.c
index 20ac4ade..45fc33e2 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -1712,7 +1712,11 @@ int do_input(bool allow_funcs)
 		)
 		preserve = TRUE;
 
-	    if (s->scfunc != 0) {
+	    if (s->scfunc == NULL) {
+		statusbar("Internal error: shortcut without function!");
+		return ERR;
+	    }
+	    {
 		const subnfunc *f = sctofunc((sc *) s);
 		if (ISSET(VIEW_MODE) && f && !f->viewok)
 		    print_view_warning();