diff --git a/src/warden-client/doc/example-info.pl.txt b/src/warden-client/doc/example-info.pl.txt
index 3af0e22966035831cd5099a0f0b9582daaaeb49d..f84e263b306845a96a4afad6cf1be34e197ad9ec 100755
--- a/src/warden-client/doc/example-info.pl.txt
+++ b/src/warden-client/doc/example-info.pl.txt
@@ -30,16 +30,16 @@ print "| Client ID  | Hostname                       | Registered          | Req
 print "+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+\n";
 
 foreach (@clients) {
-  printf("| %-10s ", $_->{'client_id'} || "unknown");
-  printf("| %-30s ", $_->{'hostname'} || "unknown");
-  printf("| %19s ", $_->{'registered'}  || "unknown");
-  printf("| %-23s ", $_->{'requestor'} || "unknown");
-  printf("| %-25s ", $_->{'service'} || "unknown");
-  printf("| %-2s ", $_->{'client_type'}  || "unknown");
-  printf("| %-15s ", $_->{'type'} || "unknown");
-  printf("| %-4s ", $_->{'receive_own_events'}  || "unknown");
-  printf("| %-50s ", $_->{'description_tags'} || "unknown");
-  printf("| %-18s |\n", $_->{'ip_net_client'} || "unknown");
+  printf("| %-10s ", $_->{'client_id'} || "NULL");
+  printf("| %-30s ", $_->{'hostname'} || "NULL");
+  printf("| %19s ", $_->{'registered'}  || "NULL");
+  printf("| %-23s ", $_->{'requestor'} || "NULL");
+  printf("| %-25s ", $_->{'service'} || "NULL");
+  printf("| %-2s ", $_->{'client_type'}  || "NULL");
+  printf("| %-15s ", $_->{'type'} || "NULL");
+  printf("| %-4s ", $_->{'receive_own_events'}  || "NULL");
+  printf("| %-50s ", $_->{'description_tags'} || "NULL");
+  printf("| %-18s |\n", $_->{'ip_net_client'} || "NULL");
 }
 print "+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+\n";
 print "\n";
diff --git a/src/warden-client/lib/WardenClientCommon.pm b/src/warden-client/lib/WardenClientCommon.pm
index 1131c4aa433ff8e960495593f5f45483c2776442..dfff617fb744e79d867dd98afd656484be953569 100755
--- a/src/warden-client/lib/WardenClientCommon.pm
+++ b/src/warden-client/lib/WardenClientCommon.pm
@@ -154,14 +154,14 @@ sub getClientsInfo
     my %client;
 
     $client{'client_id'}		= $response_data->{'CLIENT_ID'} ;
-    $client{'hostname'}		= $response_data->{'HOSTNAME'};
+    $client{'hostname'}			= $response_data->{'HOSTNAME'};
     $client{'registered'}		= $response_data->{'REGISTERED'};
     $client{'requestor'}		= $response_data->{'REQUESTOR'};
-    $client{'service'}	 	= defined $response_data->{'SERVICE'} ? $response_data->{'SERVICE'} : "-";
+    $client{'service'}	 		= $response_data->{'SERVICE'};
     $client{'client_type'}		= $response_data->{'CLIENT_TYPE'};
-    $client{'type'}			= defined $response_data->{'TYPE'} ? $response_data->{'TYPE'} : "-";
-    $client{'receive_own_events'}	= defined $response_data->{'RECEIVE_OWN_EVENTS'} ? $response_data->{'RECEIVE_OWN_EVENTS'} : "-";
-    $client{'description_tags'}	= defined $response_data->{'DESCRIPTION_TAGS'} ? $response_data->{'DESCRIPTION_TAGS'} : "-";
+    $client{'type'}			= $response_data->{'TYPE'};
+    $client{'receive_own_events'}	= $response_data->{'RECEIVE_OWN_EVENTS'};
+    $client{'description_tags'}		= $response_data->{'DESCRIPTION_TAGS'};
     $client{'ip_net_client'}		= $response_data->{'IP_NET_CLIENT'};
 
     # push received clients from warden server into @clients which is returned