1 files changed, 3 insertions, 2 deletions
diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index ee6d7eb864..dc11b0d9db 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -621,7 +621,8 @@ static const char *efi_subdirs[] = {
         "EFI/systemd",
         "EFI/BOOT",
         "loader",
-        "loader/entries"
+        "loader/entries",
+        NULL
 };
 
 static int create_dirs(const char *esp_path) {
@@ -917,7 +918,7 @@ static int remove_binaries(const char *esp_path) {
         if (q < 0 && r == 0)
                 r = q;
 
-        for (i = ELEMENTSOF(efi_subdirs); i > 0; i--) {
+        for (i = ELEMENTSOF(efi_subdirs)-1; i > 0; i--) {
                 q = rmdir_one(esp_path, efi_subdirs[i-1]);
                 if (q < 0 && r == 0)
                         r = q;