diff --git a/puppet/bootstrap-server.sh b/puppet/bootstrap-server.sh
index fccd664..18238b7 100755
--- a/puppet/bootstrap-server.sh
+++ b/puppet/bootstrap-server.sh
@@ -2,7 +2,13 @@
 
 hostname -f | fgrep "." > /dev/null
 if [ $? -ne 0 ]; then
-    echo "error, command 'hostname -f' does not return domainname"
+    echo "error, command 'hostname -f' does not return domainname" 1>&2
+    exit 1
+fi
+
+which puppet > /dev/null 2>&1
+if [ $? -ne 0 ]; then
+    echo "error, puppet binary not in path" 1>&2
     exit 1
 fi