===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.326
retrieving revision 1.328
diff -u -p -r1.326 -r1.328
--- mandoc/main.c	2019/05/03 17:31:15	1.326
+++ mandoc/main.c	2019/07/06 20:05:27	1.328
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.326 2019/05/03 17:31:15 schwarze Exp $ */
+/*	$Id: main.c,v 1.328 2019/07/06 20:05:27 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2012, 2014-2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -300,12 +300,9 @@ main(int argc, char *argv[])
 			search.outkey = oarg;
 		else {
 			while (oarg != NULL) {
-				thisarg = oarg;
 				if (manconf_output(&conf.output,
-				    strsep(&oarg, ","), 0) == 0)
-					continue;
-				warnx("-O %s: Bad argument", thisarg);
-				return (int)MANDOCLEVEL_BADARG;
+				    strsep(&oarg, ","), 0) == -1)
+					return (int)MANDOCLEVEL_BADARG;
 			}
 		}
 	}
@@ -507,7 +504,8 @@ main(int argc, char *argv[])
 	if (argc < 1) {
 		if (use_pager) {
 			tag_files = tag_init();
-			tag_files->tagname = conf.output.tag;
+			if (tag_files != NULL)
+				tag_files->tagname = conf.output.tag;
 		}
 		thisarg = "<stdin>";
 		mandoc_msg_setinfilename(thisarg);
@@ -545,7 +543,8 @@ main(int argc, char *argv[])
 			if (use_pager) {
 				use_pager = 0;
 				tag_files = tag_init();
-				tag_files->tagname = conf.output.tag;
+				if (tag_files != NULL)
+					tag_files->tagname = conf.output.tag;
 			}
 
 			mandoc_msg_setinfilename(thisarg);