diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 6121a922d0..886e1fadb1 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-10  Ramon Novoa  <rnovoa@artica.es>
+
+	* lib/PandoraFMS/DataServer.pm: Check for single tag XMLs. Fixes bug #3514207.
+
 2012-04-04  Ramon Novoa  <rnovoa@artica.es>
 
 	* lib/PandoraFMS/WMIServer.pm: Put a regexp that could crash the server
diff --git a/pandora_server/lib/PandoraFMS/DataServer.pm b/pandora_server/lib/PandoraFMS/DataServer.pm
index 510d04663e..11dce5b950 100644
--- a/pandora_server/lib/PandoraFMS/DataServer.pm
+++ b/pandora_server/lib/PandoraFMS/DataServer.pm
@@ -144,8 +144,12 @@ sub data_consumer ($$) {
 		};
 	
 		# Invalid XML
-		if ($@) {
-			$xml_err = $@;
+		if ($@ || ref($xml_data) ne 'HASH') {
+			if ($@) {
+				$xml_err = $@;
+			} else {
+				$xml_err = "Invalid XML format.";
+			}
 			sleep (2);
 			next;
 		}