diff --git a/pandora_console/include/functions_events.php b/pandora_console/include/functions_events.php
index 2b1be6fa8f..84fa1e0b70 100644
--- a/pandora_console/include/functions_events.php
+++ b/pandora_console/include/functions_events.php
@@ -2031,7 +2031,8 @@ function events_page_details ($event, $server = "") {
 		
 		$data = array();
 		$data[0] = '<div style="font-weight:normal; margin-left: 20px;">'.__('OS').'</div>';
-		$data[1] = ui_print_os_icon ($agent["id_os"], true, true).' ('.$agent["os_version"].')';
+		$data[1] = ui_print_os_icon ($agent["id_os"], true, true);
+		if (!empty($agent["os_version"])) $data[1] .= ' ('.$agent["os_version"].')';
 		$table_details->data[] = $data;
 		
 		$data = array();
diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm
index a33dd64247..e24af3c022 100644
--- a/pandora_server/lib/PandoraFMS/DataServer.pm
+++ b/pandora_server/lib/PandoraFMS/DataServer.pm
@@ -306,7 +306,7 @@ sub process_xml_data ($$$$$) {
 	
 	# Check some variables
 	$interval = 300 if (! defined ($interval) || $interval eq '');
-	$os_version = 'N/A' if (! defined ($os_version) || $os_version eq '');
+	$os_version = undef if (! defined ($os_version) || $os_version eq '');
 	
 	# Get agent address from the XML if available
 	my $address = '' ;