diff --git a/puppet/bootstrap-server.sh b/puppet/bootstrap-server.sh
index 3fa5912..fccd664 100755
--- a/puppet/bootstrap-server.sh
+++ b/puppet/bootstrap-server.sh
@@ -1,5 +1,11 @@
 #!/bin/sh
 
+hostname -f | fgrep "." > /dev/null
+if [ $? -ne 0 ]; then
+    echo "error, command 'hostname -f' does not return domainname"
+    exit 1
+fi
+
 mkdir -p /etc/puppet/manifests
 if [ ! -s /etc/puppet/manifests/site.pp ]; then
     echo "" > /etc/puppet/manifests/site.pp