diff --git a/management/univention-directory-listener/03univention-directory-listener.inst b/management/univention-directory-listener/03univention-directory-listener.inst
index fd8832b..525fd59 100755
--- a/management/univention-directory-listener/03univention-directory-listener.inst
+++ b/management/univention-directory-listener/03univention-directory-listener.inst
@@ -61,12 +61,13 @@ moduledir=/usr/lib/univention-directory-listener/system
 
 if [ "$server_role" != "domaincontroller_master" ]; then
 	if [ -e "/var/lib/univention-ldap/listener/listener" ]; then
-		chown listener /var/lib/univention-ldap/listener/listener*
+		chown listener /var/lib/univention-ldap/listener/listener* || die
 		options="-o"
 	fi
 fi
 
-univention-config-registry set ldap/database/ldbm/dbsync="10"
+TRAP "/usr/bin/univention-config-registry set ldap/database/ldbm/dbsync=$ldap_database_ldbm_dbsync" INT TERM EXIT
+univention-config-registry set ldap/database/ldbm/dbsync="10" || die
 
 if [ "`echo $ldap_master_bind | tr A-Z a-z`" = "gssapi" ]; then
 	options="$options -K"
@@ -84,17 +85,17 @@ options="$options -i -h $ldap_master -b "$ldap_base" -m $moduledir -c $cachedir"
 
 if [ -n "$server_role" ]; then
 	if [ "$server_role" = "domaincontroller_master" -o "$server_role" = "domaincontroller_backup" ]; then
-		/usr/sbin/univention-directory-listener $options -D "cn=admin,$ldap_base" -y /etc/ldap.secret
+		/usr/sbin/univention-directory-listener $options -D "cn=admin,$ldap_base" -y /etc/ldap.secret || die
 	else
-		/usr/sbin/univention-directory-listener $options -D "`univention-config-registry get ldap/hostdn`" -y /etc/machine.secret
+		/usr/sbin/univention-directory-listener $options -D "`univention-config-registry get ldap/hostdn`" -y /etc/machine.secret || die
 	fi
 else
-	/usr/sbin/univention-directory-listener $options
+	/usr/sbin/univention-directory-listener $options || die
 fi
 
 exit_status=$?
 
-univention-config-registry set ldap/database/ldbm/dbsync=$ldap_database_ldbm_dbsync
+univention-config-registry set ldap/database/ldbm/dbsync=$ldap_database_ldbm_dbsync || die
 
 # needed for db sync
 sleep 15