diff --git a/iop/scripts/genconfig.sh b/iop/scripts/genconfig.sh
index ed4c792ce..47e109aa5 100755
--- a/iop/scripts/genconfig.sh
+++ b/iop/scripts/genconfig.sh
@@ -127,14 +127,6 @@ function genconfig {
 			return
 	    fi
 
-	    for p in $brcmbca; do
-		if [ $p == $profile ]; then
-		    target="brcmbca"
-			target_config_path="$brcmbca_feed/config"
-		    return
-		fi
-	    done
-
 	    for p in $airoha; do
 		if [ $p == $profile ]; then
 		    target="airoha"
@@ -182,6 +174,14 @@ function genconfig {
 		    return
 		fi
 	    done
+
+	    for p in $brcmbca; do
+		if [ $p == $profile ]; then
+		    target="brcmbca"
+			target_config_path="$brcmbca_feed/config"
+		    return
+		fi
+	    done
 	}
 
 	git remote -v | grep -qE '(git@|ssh://)' && {
@@ -506,7 +506,7 @@ function genconfig {
 		CUSTREPO="${CUSTREPO:-git@dev.iopsys.eu:consumer/iopsys.git}"
 
 		setup_dirs
-		create_and_copy_files "$@"
+		create_and_copy_files "$@" || exit 1
 	fi
 }
 
diff --git a/iop/scripts/genconfig_min.sh b/iop/scripts/genconfig_min.sh
index 320bac966..145a3a459 100644
--- a/iop/scripts/genconfig_min.sh
+++ b/iop/scripts/genconfig_min.sh
@@ -126,14 +126,6 @@ function genconfig_min {
 			return
 	    fi
 
-	    for p in $brcmbca; do
-		if [ $p == $profile ]; then
-		    target="brcmbca"
-			target_config_path="$brcmbca_feed/config"
-		    return
-		fi
-	    done
-
 	    for p in $airoha; do
 		if [ $p == $profile ]; then
 		    target="airoha"
@@ -181,6 +173,14 @@ function genconfig_min {
 		    return
 		fi
 	    done
+
+	    for p in $brcmbca; do
+		if [ $p == $profile ]; then
+		    target="brcmbca"
+			target_config_path="$brcmbca_feed/config"
+		    return
+		fi
+	    done
 	}
 
 	git remote -v | grep -qE '(git@|ssh://)' && {