diff --git a/targets/build_helper.bash b/targets/build_helper.bash
index f3959861b5614b8004b682d574f329af794c504f..9c749aa87aea44ce5c9a4b989f6f8c959268f3f3 100755
--- a/targets/build_helper.bash
+++ b/targets/build_helper.bash
@@ -347,9 +347,10 @@ check_hss_s6a_certificate() {
     cd $OPENAIRCN_DIR/OPENAIRHSS/conf
     ./make_certs.sh ${1:-'eur'}
     if [ $# -lt 2 ] ; then
-        check_hss_s6a_certificate ${1:-'eur'} 2
+        __i=check_hss_s6a_certificate ${1:-'eur'} 2
+        return $__i
     fi
-    exit 1
+    return 1
 }
 
 check_install_usrp_uhd_driver(){