===================================================================
RCS file: /cvs/mandoc/mdoc_term.c,v
retrieving revision 1.192
retrieving revision 1.195
diff -u -p -r1.192 -r1.195
--- mandoc/mdoc_term.c	2010/10/01 21:51:13	1.192
+++ mandoc/mdoc_term.c	2010/11/29 13:02:47	1.195
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_term.c,v 1.192 2010/10/01 21:51:13 schwarze Exp $ */
+/*	$Id: mdoc_term.c,v 1.195 2010/11/29 13:02:47 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -1584,6 +1584,8 @@ termp_bd_pre(DECL_ARGS)
 		 * anyway, so don't sweat it.
 		 */
 		switch (nn->tok) {
+		case (MDOC_Sm):
+			/* FALLTHROUGH */
 		case (MDOC_br):
 			/* FALLTHROUGH */
 		case (MDOC_sp):
@@ -1655,7 +1657,7 @@ termp_xx_pre(DECL_ARGS)
 	pp = NULL;
 	switch (n->tok) {
 	case (MDOC_Bsx):
-		pp = "BSDI BSD/OS";
+		pp = "BSD/OS";
 		break;
 	case (MDOC_Dx):
 		pp = "DragonFly";
@@ -2074,7 +2076,7 @@ termp_lk_pre(DECL_ARGS)
 
 	nn = sv = n->child;
 
-	if (NULL == nn->next)
+	if (NULL == nn || NULL == nn->next)
 		return(1);
 
 	for (nn = nn->next; nn; nn = nn->next)