diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index 0fdd36a..c1f12d6 100644
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-13 Paul Jakma <paul.jakma@sun.com>
+
+	* bgp_main.c: Small fix, format string parameters should never
+	  be NULL - it's not strictly valid and some libc's don't let
+	  you away with.
+
 2007-10-30 Nick Hilliard <nick@inex.ie>
 
 	* bgp_main.c: Add 'listenon' argument, to pass address to bind
diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index 843b124..fee7f37 100644
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -321,7 +321,9 @@
 
   /* Print banner. */
   zlog_notice ("BGPd %s starting: vty@%d, bgp@%s:%d", QUAGGA_VERSION,
-	       vty_port, bm->address, bm->port);
+	       vty_port, 
+	       (bm->address ? bm->address : "<all>", 
+	       bm->port);
 
   /* Start finite state machine, here we go! */
   while (thread_fetch (master, &thread))