diff --git a/scripts/install b/scripts/install
index 542b30e..094d14f 100644
--- a/scripts/install
+++ b/scripts/install
@@ -15,7 +15,7 @@ then
 	app=$YNH_APP_INSTANCE_NAME
 
 	# Source app helpers
-	. /usr/share/yunohost/helpers
+	source /usr/share/yunohost/helpers
 else
 	domain=$1
 	path=$2
@@ -30,7 +30,7 @@ fi
 
 # Delete files and db if exit with an error
 EXIT_PROPERLY () {
-	trap '' ERR
+	trap ERR
 	echo -e "\e[91m \e[1m"	# Shell in light red bold
 	echo -e "!!\n  $app install's script has encountered an error. Installation was cancelled.\n!!"
 
diff --git a/scripts/remove b/scripts/remove
index 105333b..9b28b1d 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -6,7 +6,7 @@ if [ $ynh_version = "2.4" ]; then
 	app=$YNH_APP_INSTANCE_NAME
 
 	# Source app helpers
-	. /usr/share/yunohost/helpers
+	source /usr/share/yunohost/helpers
 else
 	app=leed
 	MYSQL_ROOT_PWD_FILE="/etc/yunohost/mysql"