===================================================================
RCS file: /cvs/mandoc/mdoc_state.c,v
retrieving revision 1.2
retrieving revision 1.4
diff -u -p -r1.2 -r1.4
--- mandoc/mdoc_state.c	2015/10/21 23:51:11	1.2
+++ mandoc/mdoc_state.c	2017/01/10 13:47:00	1.4
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_state.c,v 1.2 2015/10/21 23:51:11 schwarze Exp $ */
+/*	$Id: mdoc_state.c,v 1.4 2017/01/10 13:47:00 schwarze Exp $ */
 /*
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -195,6 +195,9 @@ state_bd(STATE_ARGS)
 	    (n->type != ROFFT_BODY || n->end != ENDBODY_NOT))
 		return;
 
+	if (n->parent->args == NULL)
+		return;
+
 	arg = n->parent->args->argv[0].arg;
 	if (arg != MDOC_Literal && arg != MDOC_Unfilled)
 		return;
@@ -246,7 +249,7 @@ state_sh(STATE_ARGS)
 	if (n->type != ROFFT_HEAD)
 		return;
 
-	if ( ! (n->flags & MDOC_VALID)) {
+	if ( ! (n->flags & NODE_VALID)) {
 		secname = NULL;
 		deroff(&secname, n);