diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index 5ef43046e5..3cbb024b4f 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-18  Ramon Novoa  <rnovoa@artica.es>
+
+	* win32/modules/pandora_module_logevent.cc: Now returns "empty" data
+	  when no data is available.
+
 2008-06-13  Ramon Novoa  <rnovoa@artica.es>
 
 	* win32/bin/PandoraAgent.exe: Updated to r857.
diff --git a/pandora_agents/win32/modules/pandora_module_logevent.cc b/pandora_agents/win32/modules/pandora_module_logevent.cc
index 7b6d2e5c96..7023c6aa8a 100755
--- a/pandora_agents/win32/modules/pandora_module_logevent.cc
+++ b/pandora_agents/win32/modules/pandora_module_logevent.cc
@@ -52,7 +52,12 @@ Pandora_Module_Logevent::run () {
     }
         
     Pandora_Wmi::getEventList (this->source, this->type, this->pattern, this->getInterval (), event_list);
-    
+
+    if (event_list.size () < 1) {
+        this->setOutput ("");
+        return;
+    }
+
     for(event = event_list.begin (); event != event_list.end(); ++event) {
         this->setOutput (*event);        
     }