diff --git a/src/kernel-install/90-loaderentry.install.in b/src/kernel-install/90-loaderentry.install.in
index 832a82794c..75c0b47aca 100755
--- a/src/kernel-install/90-loaderentry.install.in
+++ b/src/kernel-install/90-loaderentry.install.in
@@ -26,7 +26,11 @@ ENTRY_DIR_ABS="${3:?}"
 KERNEL_IMAGE="$4"
 INITRD_OPTIONS_SHIFT=4
 
-[ "$KERNEL_INSTALL_LAYOUT" = "bls" ] || exit 0
+if [ "$KERNEL_INSTALL_LAYOUT" != "bls" ]; then
+    [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && \
+        echo "KERNEL_INSTALL_LAYOUT=$KERNEL_INSTALL_LAYOUT, quitting."
+    exit 0
+fi
 
 MACHINE_ID="${KERNEL_INSTALL_MACHINE_ID:?}"
 ENTRY_TOKEN="${KERNEL_INSTALL_ENTRY_TOKEN:?}"
diff --git a/src/kernel-install/kernel-install.c b/src/kernel-install/kernel-install.c
index 4a743ac316..73dcc37c91 100644
--- a/src/kernel-install/kernel-install.c
+++ b/src/kernel-install/kernel-install.c
@@ -787,7 +787,9 @@ static int context_ensure_layout(Context *c) {
         /* There's no metadata in $BOOT_ROOT, and apparently no entry token directory installed? Then we
          * really don't know anything. */
         c->layout = LAYOUT_OTHER;
-        log_debug("Entry-token directory not found, using layout=%s.", layout_to_string(c->layout));
+        log_debug("Entry-token directory %s not found, using layout=%s.",
+                  entry_token_path,
+                  layout_to_string(c->layout));
         return 0;
 }