diff -uNr torque-2.5.2.ORIG/contrib/init.d/pbs_mom torque-2.5.2/contrib/init.d/pbs_mom
--- torque-2.5.2.ORIG/contrib/init.d/pbs_mom	2010-10-14 21:47:05.035383236 +0200
+++ torque-2.5.2/contrib/init.d/pbs_mom	2010-10-14 21:49:38.433427973 +0200
@@ -54,7 +54,7 @@
                 # ulimit -c unlimited  # Uncomment this to preserve core files
 		daemon $PBS_DAEMON $args -d $PBS_HOME
 		RET=$?
-		touch /var/lock/subsys/pbs_mom
+		[ $RET -eq 0 ] &&  touch /var/lock/subsys/pbs_mom
    		echo
 		;;
 	purge)
@@ -62,7 +62,7 @@
 		echo -n "Starting TORQUE Mom with purge: "
 		daemon $PBS_DAEMON -r
 		RET=$?
-		touch /var/lock/subsys/pbs_mom
+		[ $RET -eq 0 ] && touch /var/lock/subsys/pbs_mom
    		echo
 		;;
 	stop)
diff -uNr torque-2.5.2.ORIG/contrib/init.d/pbs_sched torque-2.5.2/contrib/init.d/pbs_sched
--- torque-2.5.2.ORIG/contrib/init.d/pbs_sched	2010-10-14 21:47:05.034384022 +0200
+++ torque-2.5.2/contrib/init.d/pbs_sched	2010-10-14 21:50:32.826542794 +0200
@@ -22,7 +22,7 @@
 		echo -n "Starting TORQUE Scheduler: "
 		daemon $PBS_DAEMON -d $PBS_HOME
 		RET=$?
-		touch /var/lock/subsys/pbs_sched
+		[ $RET -eq 0 ] && touch /var/lock/subsys/pbs_sched
 		echo
 		;;
 	stop)
diff -uNr torque-2.5.2.ORIG/contrib/init.d/pbs_server torque-2.5.2/contrib/init.d/pbs_server
--- torque-2.5.2.ORIG/contrib/init.d/pbs_server	2010-10-14 21:47:05.034384022 +0200
+++ torque-2.5.2/contrib/init.d/pbs_server	2010-10-14 21:50:09.310577353 +0200
@@ -28,7 +28,7 @@
 			daemon $PBS_DAEMON -t create -d $PBS_HOME
 		fi
 		RET=$?
-		touch /var/lock/subsys/pbs_server
+		[ $RET -eq 0 ] && touch /var/lock/subsys/pbs_server
 		echo
 		;;
 	stop)