diff --git a/pandora_agents/win32/ChangeLog b/pandora_agents/win32/ChangeLog
index 757de40cbf..00057e69e1 100644
--- a/pandora_agents/win32/ChangeLog
+++ b/pandora_agents/win32/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-19  Ramon Novoa  <rnovoa@artica.es>
+
+	* modules/pandora_module_plugin.cc: Set a virtually infinite timeout
+	  for plugins.
+
+	* pandora_windows_service.cc: The Pandora_Windows_Service destructor
+	  could try to dereference a NULL pointer. Fixed.
+
 2011-07-29 Dario Rodriguez <dario.rodriguez@artica.es>
 
 	* bin/PandoraAgent.exe: Compiled new exe with a bug fixed.
diff --git a/pandora_agents/win32/modules/pandora_module_plugin.cc b/pandora_agents/win32/modules/pandora_module_plugin.cc
index be9ba3fb49..359738d918 100644
--- a/pandora_agents/win32/modules/pandora_module_plugin.cc
+++ b/pandora_agents/win32/modules/pandora_module_plugin.cc
@@ -19,7 +19,8 @@
 
 #include "pandora_module_plugin.h"
 #include "../pandora_strutils.h"
-#include <windows.h> 
+#include <windows.h>
+#include <limits.h>
 
 using namespace Pandora;
 using namespace Pandora_Strutils;
@@ -34,6 +35,7 @@ using namespace Pandora_Modules;
 Pandora_Module_Plugin::Pandora_Module_Plugin (string name, string plugin)
 					 : Pandora_Module_Exec ("plugin", plugin) {
 	this->setKind (module_plugin_str);
+	this->setTimeout (INT_MAX);
 }
 
 /** 
diff --git a/pandora_agents/win32/pandora_windows_service.cc b/pandora_agents/win32/pandora_windows_service.cc
index 822d3378a8..77b4ca0b93 100644
--- a/pandora_agents/win32/pandora_windows_service.cc
+++ b/pandora_agents/win32/pandora_windows_service.cc
@@ -83,11 +83,10 @@ Pandora_Windows_Service::setValues (const char * svc_name,
  */
 Pandora_Windows_Service::~Pandora_Windows_Service () {
 	
-	if(conf->getValue("proxy_mode") != "") {
-		killTentacleProxy();
-	}
-
 	if (this->conf != NULL) {
+		if(conf->getValue("proxy_mode") != "") {
+			killTentacleProxy();
+		}
 		delete this->conf;
 	}