diff --git a/koji-setup/add-koji-builder.sh b/koji-setup/koji-add-builder.sh
similarity index 98%
rename from koji-setup/add-koji-builder.sh
rename to koji-setup/koji-add-builder.sh
index 8494547..a8476e7 100644
--- a/koji-setup/add-koji-builder.sh
+++ b/koji-setup/koji-add-builder.sh
@@ -18,7 +18,7 @@ for param in $1 $2 ; do
 done
 
 if [ $DEBUG ] ; then
-    set -x
+    set -xe
     SILENT=
     QUIET="-v"
 fi
@@ -49,7 +49,8 @@ fi
 if [ -z $KOJI_BUILD_FQDN ] ; then
     KOJI_BUILD_FQDN=$KOJI_HUB_FQDN
 fi
-if [ ! (nc -z $KOJI_BUILD_FQDN 22) ] ; then
+
+if [ ! nc -z $KOJI_BUILD_FQDN 22 2>/dev/null ] ; then
         echo "I cannot connect to $KOJI_BUILD_FQDN! Is it online? "
         echo "Options:"
         echo "- turn on the server"