:: commit 75a1f8a763907393ad41294e8da1b53319eac4c6

diff --git a/common/entry.s3.c b/common/entry.s3.c
index 49061b76..3f3fabda 100644
--- a/common/entry.s3.c
+++ b/common/entry.s3.c
@@ -102,7 +102,7 @@ could_not_match:
                                      (void **)&loaded_image);
 
         if (status) {
-            panic(false, "HandleProtocol failure (%x)", status);
+            goto could_not_match;
         }
 
         boot_volume = disk_volume_from_efi_handle(loaded_image->DeviceHandle);