Index: scheduler/client.c
===================================================================
--- scheduler/client.c.orig	2006-05-12 17:50:07.780299000 -0500
+++ scheduler/client.c	2006-05-21 23:16:55.549733000 -0500
@@ -1376,7 +1376,8 @@
               cupsdLogMessage(CUPSD_LOG_DEBUG2,
 	                      "cupsdReadClient: %d command=\"%s\", "
 			      "options = \"%s\"",
-	        	      con->http.fd, con->command, con->options);
+	        	      con->http.fd, con->command,
+	        	      con->options ? con->options : "(null)");
 
 	      if (con->http.version <= HTTP_1_0)
 		con->http.keep_alive = HTTP_KEEPALIVE_OFF;
@@ -3507,7 +3508,7 @@
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2,
                   "pipe_command: command=\"%s\", options=\"%s\"",
-                  command, options);
+                  command, options ? options : "(null)");
 
   argv[0]      = command;
   query_string = NULL;
Index: scheduler/auth.c
===================================================================
--- scheduler/auth.c.orig	2006-05-21 23:21:58.800123000 -0500
+++ scheduler/auth.c	2006-05-21 23:22:38.096259000 -0500
@@ -1497,7 +1497,8 @@
 
   cupsdLogMessage(CUPSD_LOG_DEBUG2,
                   "cupsdIsAuthorized: con->uri=\"%s\", con->best=%p(%s)",
-                  con->uri, con->best, con->best ? con->best->location : "");
+                  con->uri, con->best, con->best ? con->best->location ?
+                  con->best->location : "(null)" : "");
   if (owner)
     cupsdLogMessage(CUPSD_LOG_DEBUG2,
                     "cupsdIsAuthorized: owner=\"%s\"", owner);
