diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index 506e9d4fdf..2125627a00 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-13  Ramon Novoa  <rnovoa@artica.es>
+
+	* unix/pandora_agent: Display proxy mode errors in the log file.
+
 2013-07-10 Miguel de Dios <miguel.dedios@artica.es>
 
 	* unix/NT4/pandora_agent.conf, pc/NT4/pandora_agent.conf: set the
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index 72c5d6b4a9..fdc3538d27 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -921,10 +921,11 @@ sub launch_tentacle_proxy () {
 			my $new_process = "tentacle_server -b ".$Conf{'server_ip'}." -g ".$Conf{'server_port'}." -c ".$Conf{'proxy_max_connection'}." -t ".$Conf{'proxy_timeout'};
 
 			log_message ('setup', 'Proxy mode enabled');
-			exec ($new_process);		
+			exec ($new_process);
 		} 
 	} else {
-		error ('You can not proxy to localhost');
+		log_message ('error', 'You can not proxy to localhost');
+		exit 1;
 	}
 }
 
@@ -2002,7 +2003,8 @@ if ($Conf{'proxy_mode'}) {
 	if ($> != 0) {		
 		launch_tentacle_proxy();
 	} else {
-		error ('Proxy mode can not be launched as root');
+		log_message ('Proxy mode can not be launched as root');
+		exit 1;
 	}
 }