diff --git a/bin/named/server.c b/bin/named/server.c
index 96db642c6b..ee55db2693 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -9262,6 +9262,9 @@ ns_server_rekey(ns_server_t *server, isc_lex_t *lex, isc_buffer_t **text) {
 	char *ptr;
 
 	ptr = next_token(lex, text);
+	if (ptr == NULL)
+		return (ISC_R_UNEXPECTEDEND);
+
 	if (strcasecmp(ptr, NS_COMMAND_SIGN) == 0)
 		fullsign = ISC_TRUE;