diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 6d57b0be92..b8ce45fbcf 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,5 +1,8 @@
 2010-10-07  Sancho Lerena <slerena@artica.es>
 
+        * godmode/alerts/alert_list.list.php: Another ugly warning fixed due 
+        an undefined array. PLEASE dont use foreach on arrays non-checked !
+
 	* godmode/agentes/configurar_agente.php: Added custom fields to the global
 	edit/insert code. Not really used here, but for the future.
 
diff --git a/pandora_console/godmode/alerts/alert_list.list.php b/pandora_console/godmode/alerts/alert_list.list.php
index 433b6e3ab7..210acaf8d0 100644
--- a/pandora_console/godmode/alerts/alert_list.list.php
+++ b/pandora_console/godmode/alerts/alert_list.list.php
@@ -44,9 +44,14 @@ $form_filter .= print_input_text ('template_name', $templateName, '', 12, 255, t
 $form_filter .= "</td>\n";
 $temp = get_agents();
 $arrayAgents = array();
-foreach ($temp as $agentElement) {
-	$arrayAgents[$agentElement['id_agente']] = $agentElement['nombre'];
+
+# Avoid empty arrays, warning messages are UGLY !
+if ($temp){
+    foreach ($temp as $agentElement) {
+    	$arrayAgents[$agentElement['id_agente']] = $agentElement['nombre'];
+    }
 }
+
 $form_filter .= "<td>".__('Agents')."</td><td>";
 $form_filter .= print_input_text_extended ('agent_name', $agentName, 'text-agent_name', '', 12, 100, false, '',
 array('style' => 'background: url(images/lightning.png) no-repeat right;'), true);