diff --git a/bin/nvrun b/bin/nvrun
index f7e67eb..7cf2d94 100755
--- a/bin/nvrun
+++ b/bin/nvrun
@@ -7,6 +7,8 @@ TIMEOUT=8           # wait timeout for X server start
 LOCK_FILE=/tmp/.snail.lock
 FIFO_FILE=/tmp/.snail.fifo
 
+[ ! -f $LOCK_FILE ] && echo "Snail daemon is not running. Please start." && exit -1
+
 {
   flock -w 0 -s 9
   if [ 0 -ne $? ]; then
diff --git a/sbin/snail-watcher.sh b/sbin/snail-watcher.sh
index 0607311..6abc5d8 100755
--- a/sbin/snail-watcher.sh
+++ b/sbin/snail-watcher.sh
@@ -20,6 +20,15 @@ FIFO_FILE=/tmp/.snail.fifo
 
 $XSERVER_STOP_CMD && snail.nv_pwr_off # stop X service
 
+sigterm ()
+{
+  rm -f $LOCK_FILE
+  rm -f $FIFO_FILE
+  exit 0
+}
+
+trap sigterm SIGTERM
+
 touch $LOCK_FILE && chown root:video $LOCK_FILE && chmod 660 $LOCK_FILE # create lock file
 rm -f $FIFO_FILE && mkfifo --mode 660 $FIFO_FILE && chgrp video $FIFO_FILE # create fifo