diff --git a/ypbind-pre-setdomain b/ypbind-pre-setdomain
index 26038fd..7ef5fc8 100755
--- a/ypbind-pre-setdomain
+++ b/ypbind-pre-setdomain
@@ -22,6 +22,7 @@ if [ "$DOMAINNAME" = "(none)" -o "$DOMAINNAME" = "" ]; then
 	    echo $"'$NISDOMAIN' (/etc/yp.conf)"
 	else
             logger -t ypbind $"domain not found"
+            exit 1
         fi
     fi
 fi
diff --git a/ypbind.spec b/ypbind.spec
index cdcbed6..7ec9212 100644
--- a/ypbind.spec
+++ b/ypbind.spec
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain
 Name: ypbind
 Version: 1.33
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{version}.tar.bz2
@@ -117,6 +117,9 @@ fi
 %doc README NEWS COPYING
 
 %changelog
+* Thu Jan 12 2011 Honza Horak <hhorak@redhat.com> - 3:1.33-10
+- Fail to start ypbind service if domainname is not set
+
 * Wed Nov 16 2011 Honza Horak <hhorak@redhat.com> - 3:1.33-9
 - Fixed ypbind-post-waitbind to stop the service when binding is not success