diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 6e0fab2d1b..c69cc81cbb 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-08  Sergio Martin <sergio.martin@artica.es>
+
+	*  godmode/agentes/module_manager_editor_common.php
+	 godmode/agentes/module_manager_editor.php: Fixed SQL 
+	 error when try to create a module called 0
+
 2010-10-08  Junichi Satoh  <junichi@rworks.jp>
 
 	* godmode/massive/massive_add_action_alerts.php,
diff --git a/pandora_console/godmode/agentes/module_manager_editor.php b/pandora_console/godmode/agentes/module_manager_editor.php
index e202b48c33..ecff1350d4 100644
--- a/pandora_console/godmode/agentes/module_manager_editor.php
+++ b/pandora_console/godmode/agentes/module_manager_editor.php
@@ -289,7 +289,7 @@ if (isset ($extra_title))
 	echo ' - '.$extra_title;
 echo '</h3>';
 
-if($config['enterprise_installed']) {
+if($config['enterprise_installed'] && $id_agent_module) {
 	if (isModuleInPolicy($id_agent_module)) {
 		add_policy_linkation($id_agent_module);
 	}
diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php
index 0e53849228..7c839e3e9a 100644
--- a/pandora_console/godmode/agentes/module_manager_editor_common.php
+++ b/pandora_console/godmode/agentes/module_manager_editor_common.php
@@ -97,7 +97,7 @@ $disabledBecauseInPolicy = false;
 $disabledTextBecauseInPolicy = '';
 
 $page = get_parameter('page', '');
-if (strstr($page, "policy_modules") === false) {
+if (strstr($page, "policy_modules") === false && $id_agent_module) {
 	if ($config['enterprise_installed'])
 		$disabledBecauseInPolicy = isModuleInPolicy($id_agent_module) && isModuleLinked($id_agent_module);
 	else