===================================================================
RCS file: /cvs/mandoc/mdoc_html.c,v
retrieving revision 1.111
retrieving revision 1.114
diff -u -p -r1.111 -r1.114
--- mandoc/mdoc_html.c	2010/10/10 09:59:48	1.111
+++ mandoc/mdoc_html.c	2010/12/05 15:37:30	1.114
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_html.c,v 1.111 2010/10/10 09:59:48 kristaps Exp $ */
+/*	$Id: mdoc_html.c,v 1.114 2010/12/05 15:37:30 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -843,7 +843,7 @@ mdoc_xx_pre(MDOC_ARGS)
 
 	switch (n->tok) {
 	case (MDOC_Bsx):
-		pp = "BSDI BSD/OS";
+		pp = "BSD/OS";
 		break;
 	case (MDOC_Dx):
 		pp = "DragonFly";
@@ -1331,6 +1331,10 @@ mdoc_bd_pre(MDOC_ARGS)
 			/* FALLTHROUGH */
 		case (MDOC_Bl):
 			/* FALLTHROUGH */
+		case (MDOC_D1):
+			/* FALLTHROUGH */
+		case (MDOC_Dl):
+			/* FALLTHROUGH */
 		case (MDOC_Lp):
 			/* FALLTHROUGH */
 		case (MDOC_Pp):
@@ -1675,7 +1679,7 @@ mdoc_lk_pre(MDOC_ARGS)
 	PAIR_HREF_INIT(&tag[1], nn->string);
 	print_otag(h, TAG_A, 2, tag);
 
-	if (NULL == nn->next) 
+	if (NULL == nn || NULL == nn->next) 
 		return(1);
 
 	for (nn = nn->next; nn; nn = nn->next)