diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 1237b56fa6..8f4be60f20 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-17  Miguel de Dios  <miguel.dedios@artica.es>
+
+	* pandora_console/godmode/reporting/map_builder.php: fix small bug when
+	there are'nt any elements in the map and it try loop foearch.
+
 2009-09-17  Miguel de Dios  <miguel.dedios@artica.es>
 
 	* pandora_console/include/functions_events.php: fix the insert event,
diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php
index 9f78cd6ebb..6f2778538d 100644
--- a/pandora_console/godmode/reporting/map_builder.php
+++ b/pandora_console/godmode/reporting/map_builder.php
@@ -431,9 +431,11 @@ if (! $edit_layout && ! $id_layout) {
 			FROM tlayout_data AS t1
 			WHERE t1.id_layout = $id_layout");
 		$tempArraySelect = array();
-		foreach ($elements as $element) {
-			$tempArraySelect[$element['id']] = $element['label'] . " - " .
-				$element['name_agent'] . " - " . $element['name_module'];
+		if (is_array($elements)) {
+			foreach ($elements as $element) {
+				$tempArraySelect[$element['id']] = $element['label'] . " - " .
+					$element['name_agent'] . " - " . $element['name_module'];
+			}
 		}
 		print_select($tempArraySelect, 'delete_element', '', '', __('None'), 0);
 		print " ";