diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 8c6352507a..d1000ed162 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-07  Sancho Lerena <slerena@artica.es>
+
+	* lib/PandoraFMS/DataServer.pm: Fixed call to undefined variable
+	on GIS code.
+
 2010-05-05  Ramon Novoa  <rnovoa@artica.es>
 
 	* lib/PandoraFMS/Core.pm: Use the data timestamp instead of the
diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm
index d9fd64e037..ca3999222d 100644
--- a/pandora_server/lib/PandoraFMS/DataServer.pm
+++ b/pandora_server/lib/PandoraFMS/DataServer.pm
@@ -277,6 +277,9 @@ sub process_xml_data ($$$$$) {
 	$AgentSem->up ();
 
 	if ($valid_position_data == 1 && $pa_config->{'activate_gis'} != 0) {
+		if (!defined($parent_agent_name)){
+                        $parent_agent_name = "";
+                }
 		logger($pa_config,"Parent_agent_name $parent_agent_name",10);
 		if ($pa_config->{'update_parent'} == 1 && $parent_id != 0) {
 		logger($pa_config,"Parent_agent_name $parent_agent_name",10);