Index: 76univention-saml.inst
===================================================================
--- 76univention-saml.inst	(Revision 44721)
+++ 76univention-saml.inst	(Arbeitskopie)
@@ -65,7 +65,7 @@
 	--set syntax="samlserviceprovider" \
 	--set tabAdvanced=0 \
 	--set mayChange=1 \
-	--set multivalue=1 \
+	--set multivalue=1  || die
 
 udm saml/serviceprovider create "$@" \
 	--ignore_exists \
@@ -77,7 +77,7 @@
 	--set AssertionConsumerService="https://www.google.com/a/univention-test.mygbiz.com/acs" \
 	--set simplesamlNameIDAttribute="uid" \
 	--set privacypolicyURL="http://support.google.com/a/bin/answer.py?hl=en&answer=60762" \
-	--set serviceProviderOrganizationName="Google Apps"
+	--set serviceProviderOrganizationName="Google Apps" || die
 
 udm saml/serviceprovider create "$@" \
 	--ignore_exists \
@@ -90,7 +90,7 @@
 	--set simplesamlNameIDAttribute="uid" \
 	--set privacypolicyURL="https://www.testshib.org/policy.html" \
 	--set serviceProviderOrganizationName="TestShib Two" \
-	--set serviceproviderdescription="TestShib Two is a testing service intended for new installations of Shibboleth. All SAML 2.0 implementations are welcome and may be tested against Shibboleth here"
+	--set serviceproviderdescription="TestShib Two is a testing service intended for new installations of Shibboleth. All SAML 2.0 implementations are welcome and may be tested against Shibboleth here" || die
 
 udm saml/serviceprovider create "$@" \
 	--ignore_exists \
@@ -102,7 +102,7 @@
 	--set AssertionConsumerService="https://sp.testshib.org/Shibboleth.sso/SAML2/POST" \
 	--set simplesamlNameIDAttribute="mailPrimaryAddress" \
 	--set privacypolicyURL="https://trust.salesforce.com/trust/privacy/" \
-	--set serviceProviderOrganizationName="Salesforce" \
+	--set serviceProviderOrganizationName="Salesforce" || die
 
 joinscript_save_current_version
 exit 0
Index: debian/univention-saml-schema.postinst
===================================================================
--- debian/univention-saml-schema.postinst	(Revision 44721)
+++ debian/univention-saml-schema.postinst	(Arbeitskopie)
@@ -46,6 +46,7 @@
 			invoke-rc.d univention-directory-listener restart
 		fi
 
+		stop_udm_cli_server
 		call_joinscript 76univention-saml.inst
 		;;