diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index d4e824f749..884ae41f61 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-20  Sancho Lerena <slerena@artica.es>
+
+	* util/pandora_server: Fixed incorrect message for SUSE daemon when stop
+	the server.
+
 2009-10-20  Ramon Novoa  <rnovoa@artica.es>
 
 	* lib/PandoraFMS/SNMPServer.pm: Save as much information as possible if
diff --git a/pandora_server/util/pandora_server b/pandora_server/util/pandora_server
index ba9e475dbe..2b5928c971 100755
--- a/pandora_server/util/pandora_server
+++ b/pandora_server/util/pandora_server
@@ -106,9 +106,10 @@ case "$1" in
 		
 			# Send a KILL -9 signal to process, if it's alive after 60secs, we need
 			# to be sure is really dead, and not pretending...
-
-			kill -9 $PANDORA_PID > /dev/null 2>&1
-
+			if [ ! -z "$PANDORA_PID" ]
+                        then
+                                kill -9 $PANDORA_PID   > /dev/null 2>&1
+                        fi
 			rc_status -v
 		fi
 	;;