===================================================================
RCS file: /cvs/mandoc/read.c,v
retrieving revision 1.7
retrieving revision 1.9
diff -u -p -r1.7 -r1.9
--- mandoc/read.c	2011/03/28 21:49:42	1.7
+++ mandoc/read.c	2011/04/03 10:05:37	1.9
@@ -1,4 +1,4 @@
-/*	$Id: read.c,v 1.7 2011/03/28 21:49:42 kristaps Exp $ */
+/*	$Id: read.c,v 1.9 2011/04/03 10:05:37 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -709,8 +709,10 @@ void
 mparse_result(struct mparse *curp, struct mdoc **mdoc, struct man **man)
 {
 
-	*mdoc = curp->mdoc;
-	*man = curp->man;
+	if (mdoc)
+		*mdoc = curp->mdoc;
+	if (man)
+		*man = curp->man;
 }
 
 void
@@ -740,7 +742,8 @@ mandoc_msg(enum mandocerr er, struct mparse *m, 
 	if (level < m->wlevel)
 		return;
 
-	(*m->mmsg)(er, level, m->file, ln, col, msg);
+	if (m->mmsg)
+		(*m->mmsg)(er, level, m->file, ln, col, msg);
 
 	if (m->file_status < level)
 		m->file_status = level;