diff --git a/management/univention-join/univention-run-join-scripts b/management/univention-join/univention-run-join-scripts
index 2e8cc46..2fbb801 100755
--- a/management/univention-join/univention-run-join-scripts
+++ b/management/univention-join/univention-run-join-scripts
@@ -220,6 +220,7 @@ echo
 echo "univention-run-join-scripts started"
 date
 echo
+EXITCODE=0
 if [ -e "/usr/lib/univention-install/" ]
 then
 	for i in "${SCRIPTS[@]}"
@@ -247,6 +248,7 @@ then
 		RET=$?
 		echo "EXITCODE=$RET"
 		if [ $RET != 0 ]; then
+			EXITCODE=1
 			echo -e "\033[60Gfailed (exitcode: $RET)" >&3
 		else
 			echo -e "\033[60Gdone" >&3
@@ -260,4 +262,4 @@ date
 echo "univention-run-join-scripts finished"
 echo
 
-exit 0
+exit $EXITCODE