Index: callerid.c
===================================================================
--- callerid.c	(revision 147385)
+++ callerid.c	(working copy)
@@ -1065,11 +1065,11 @@
 {
 	if (!unknown)
 		unknown = "<unknown>";
-	if (name && num)
+	if (!ast_strlen_zero(name) && !ast_strlen_zero(num))
 		snprintf(buf, bufsiz, "\"%s\" <%s>", name, num);
-	else if (name) 
+	else if (!ast_strlen_zero(name)) 
 		ast_copy_string(buf, name, bufsiz);
-	else if (num)
+	else if (!ast_strlen_zero(num))
 		ast_copy_string(buf, num, bufsiz);
 	else
 		ast_copy_string(buf, unknown, bufsiz);