diff --git a/utils/watchcontainerrun.sh b/utils/watchcontainerrun.sh
old mode 100644
new mode 100755
index fc2bfca06..2a9c71156
--- a/utils/watchcontainerrun.sh
+++ b/utils/watchcontainerrun.sh
@@ -7,7 +7,7 @@ FILENAME="$2"
 STARTSCRIPT="$3"
 CLEANUPSCRIPT="$4"
 
-while ! grep 'CONTAINER_ID=' "$FILENAME" ; do
+while ! grep -q 'CONTAINER_ID=' "$FILENAME" ; do
   sleep 1
 done
 
@@ -19,7 +19,9 @@ $STARTSCRIPT
 
 while [ -e "$FILENAME" ] ; do
   sleep 1
-  if ! $RUNNER ps | grep "$CONTAINER_ID" ; then
+  if ! $RUNNER ps --no-trunc | grep -q "$CONTAINER_ID" ; then
+    $RUNNER ps | grep "$CONTAINER_ID"
+    rm "$FILENAME"
     exit
   fi
   inotifywait -e ATTRIB -t 10 "$FILENAME" > /dev/null 2&>/dev/null
@@ -29,7 +31,5 @@ $RUNNER stop "$CONTAINER_ID"
 
 $CLEANUPSCRIPT
 
-rm "$FILENAME"
-
 #$UTILPATH/watchrun.sh "$FILENAME" "$STARTSCRIPT" "$CLEANUPSCRIPT"