diff --git a/girnode.c b/girnode.c
index ce3e9ba00..fd74dd9ff 100644
--- a/girnode.c
+++ b/girnode.c
@@ -821,8 +821,11 @@ g_ir_node_get_full_size_internal (GIrNode *parent,
       size = 0;
     }
 
-  g_debug ("node '%s' %p type '%s' full size %d", node->name, node,
-	   g_ir_node_type_to_string (node->type), size);
+  g_debug ("node %s%s%s%p type '%s' full size %d",
+	   node->name ? "'" : "",
+	   node->name ? node->name : "",
+	   node->name ? "' " : "",
+	   node, g_ir_node_type_to_string (node->type), size);
 
   return size;
 }
@@ -1170,8 +1173,9 @@ g_ir_node_build_typelib (GIrNode    *node,
 
   g_assert (node != NULL);
 
-  g_debug ("build_typelib: %s (%s)",
-	   node->name,
+  g_debug ("build_typelib: %s%s(%s)",
+	   node->name ? node->name : "",
+	   node->name ? " " : "",
 	   g_ir_node_type_to_string (node->type));
 
   switch (node->type)
@@ -2122,8 +2126,11 @@ g_ir_node_build_typelib (GIrNode    *node,
       g_assert_not_reached ();
     }
   
-  g_debug ("node '%s' %p type '%s', offset %d -> %d, offset2 %d -> %d",
-	   node->name, node, g_ir_node_type_to_string (node->type),
+  g_debug ("node %s%s%s%p type '%s', offset %d -> %d, offset2 %d -> %d",
+	   node->name ? "'" : "",
+	   node->name ? node->name : "",
+	   node->name ? "' " : "",
+	   node, g_ir_node_type_to_string (node->type),
 	   old_offset, *offset, old_offset2, *offset2);
 
   if (*offset2 - old_offset2 + *offset - old_offset > g_ir_node_get_full_size (node))