diff --git a/build_scripts/Android/prepare-toolchain-clang.sh b/build_scripts/Android/prepare-toolchain-clang.sh
index 2c64a5186..83c30721b 100755
--- a/build_scripts/Android/prepare-toolchain-clang.sh
+++ b/build_scripts/Android/prepare-toolchain-clang.sh
@@ -28,7 +28,7 @@ function define_default_value()
 	VAR_NAME="${1}"
 	DEFAULT_VALUE="${2}"
 
-	[ -z "${!VAR_NAME}" ] && export ${VAR_NAME}="${DEFAULT_VALUE}"
+	[ -z "${!VAR_NAME}" ] && export ${VAR_NAME}="${DEFAULT_VALUE}" || true
 }
 
 ## You are supposed to provide the following variables according to your system setup
diff --git a/build_scripts/Android/start_gdbserver.sh b/build_scripts/Android/start_gdbserver.sh
index af25e3be1..1fd751e67 100755
--- a/build_scripts/Android/start_gdbserver.sh
+++ b/build_scripts/Android/start_gdbserver.sh
@@ -36,7 +36,7 @@ function define_default_value()
 	VAR_NAME="${1}"
 	DEFAULT_VALUE="${2}"
 
-	[ -z "${!VAR_NAME}" ] && export ${VAR_NAME}="${DEFAULT_VALUE}"
+	[ -z "${!VAR_NAME}" ] && export ${VAR_NAME}="${DEFAULT_VALUE}" || true
 }
 
 define_default_value ANDROID_APK_PACKAGE "org.retroshare.service"