diff --git a/genomix/src/main/resources/scripts/startCluster.sh b/genomix/src/main/resources/scripts/startCluster.sh
index a0c2063..f3d3505 100755
--- a/genomix/src/main/resources/scripts/startCluster.sh
+++ b/genomix/src/main/resources/scripts/startCluster.sh
@@ -1,3 +1,17 @@
 bin/startcc.sh
 sleep 5
 bin/startAllNCs.sh
+
+. conf/cluster.properties
+# do we need to specify the version somewhere?
+hyrackcmd=`ls ${HYRACKS_HOME}/hyracks-cli/target/hyracks-cli-*-binary-assembly/bin/hyrackscli`
+# find zip file
+appzip=`ls ../genomix-*-binary-assembly.zip`
+
+[ -f $hyrackcmd ] || { echo "Hyracks commandline is missing"; exit -1;}
+[ -f $appzip ] || { echo "Genomix binary-assembly.zip is missing"; exit -1;}
+
+CCHOST_NAME=`cat conf/master`
+
+echo "connect to \"${CCHOST_NAME}:${CC_CLIENTPORT}\"; create application text \"$appzip\";" | $hyrackcmd 
+
diff --git a/genomix/src/main/resources/scripts/stopcc.sh b/genomix/src/main/resources/scripts/stopcc.sh
index c2f525a..1865054 100644
--- a/genomix/src/main/resources/scripts/stopcc.sh
+++ b/genomix/src/main/resources/scripts/stopcc.sh
@@ -4,7 +4,7 @@
 #Kill process
 PID=`ps -ef|grep ${USER}|grep java|grep hyracks|awk '{print $2}'`
 echo $PID
-kill -9 $PID
+[ "$PID" != "" ] && kill -9 $PID
 
 #Clean up CC temp dir
 rm -rf $CCTMP_DIR/*
diff --git a/genomix/src/main/resources/scripts/stopnc.sh b/genomix/src/main/resources/scripts/stopnc.sh
index 03ce4e7..3928bb7 100644
--- a/genomix/src/main/resources/scripts/stopnc.sh
+++ b/genomix/src/main/resources/scripts/stopnc.sh
@@ -10,7 +10,7 @@
 fi
 
 echo $PID
-kill -9 $PID
+[ "$PID" != "" ] && kill -9 $PID
 
 #Clean up I/O working dir
 io_dirs=$(echo $IO_DIRS | tr "," "\n")