diff --git a/lib/functions/main/build-packages.sh b/lib/functions/main/build-packages.sh
index d59768f55c..10e31c4b07 100644
--- a/lib/functions/main/build-packages.sh
+++ b/lib/functions/main/build-packages.sh
@@ -107,6 +107,9 @@ function main_default_build_packages() {
 
 	overlayfs_wrapper "cleanup"
 
+	# Further packages require aggregation (BSPs use aggregated stuff, etc)
+	assert_requires_aggregation # Bombs if aggregation has not run
+
 	# create board support package
 	if [[ -n "${RELEASE}" && ! -f "${DEB_STORAGE}/${BSP_CLI_PACKAGE_FULLNAME}.deb" && "${REPOSITORY_INSTALL}" != *armbian-bsp-cli* ]]; then
 		LOG_SECTION="create_board_package" do_with_logging create_board_package
diff --git a/lib/functions/main/default-build.sh b/lib/functions/main/default-build.sh
index 3a9ee08f40..a787a6318f 100644
--- a/lib/functions/main/default-build.sh
+++ b/lib/functions/main/default-build.sh
@@ -1,14 +1,13 @@
 # This does NOT run under the logging manager.
 function full_build_packages_rootfs_and_image() {
 
-	assert_requires_aggregation # Bombs if aggregation has not run
-
 	main_default_build_packages # has its own logging sections # requires aggregation
 
 	# build rootfs, if not only kernel. Again, read "KERNEL_ONLY" as if it was "PACKAGES_ONLY"
 	if [[ "${KERNEL_ONLY}" != "yes" ]]; then
 		display_alert "Building image" "${BOARD}" "target-started"
-		build_rootfs_and_image # old "debootstrap-ng"; has its own logging sections.
+		assert_requires_aggregation # Bombs if aggregation has not run
+		build_rootfs_and_image      # old "debootstrap-ng"; has its own logging sections.
 		display_alert "Done building image" "${BOARD}" "target-reached"
 	fi
 }