diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 1f80461e48..6121a922d0 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-04  Ramon Novoa  <rnovoa@artica.es>
+
+	* lib/PandoraFMS/WMIServer.pm: Put a regexp that could crash the server
+	  inside an eval. Fixes bug #3509354.
+
 2012-04-03  Ramon Novoa  <rnovoa@artica.es>
 
 	* lib/PandoraFMS/NetworkServer.pm: Fixed the return value of
diff --git a/pandora_server/lib/PandoraFMS/WMIServer.pm b/pandora_server/lib/PandoraFMS/WMIServer.pm
index b717dd8dbd..f0dc9b1eb9 100644
--- a/pandora_server/lib/PandoraFMS/WMIServer.pm
+++ b/pandora_server/lib/PandoraFMS/WMIServer.pm
@@ -189,7 +189,10 @@ sub data_consumer ($$) {
 	# Regexp
 	if ($module->{'snmp_community'} ne ''){
 		my $filter = $module->{'snmp_community'};
-		$module_data = ($module_data =~ /$filter/) ? 1 : 0;
+		eval {
+			no warnings;
+			$module_data = ($module_data =~ /$filter/) ? 1 : 0;
+		};
 	}
 
 	my $utimestamp = time ();