diff --git a/src/tests/test-addr-decode.c b/src/tests/test-addr-decode.c
index db1b96b3..bfe7db55 100644
--- a/src/tests/test-addr-decode.c
+++ b/src/tests/test-addr-decode.c
@@ -60,10 +60,15 @@ main (gint argc,
                                                                        sample->addrs[i],
                                                                        &tag);
 
-                  g_print ("%u: %s [%s]\n",
-                           i,
-                           name ? name : "-- missing --",
-                           tag ? g_quark_to_string (tag) : "No Tag");
+                  if (tag)
+                    g_print ("%u: %s [%s]\n",
+                             i,
+                             name ? name : "-- missing --",
+                             g_quark_to_string (tag));
+                  else
+                    g_print ("%u: %s\n",
+                             i,
+                             name ? name : "-- missing --");
                 }
 
               g_print ("======\n");