diff --git a/common/entry.s3.c b/common/entry.s3.c
index edd136f9..6750367a 100644
--- a/common/entry.s3.c
+++ b/common/entry.s3.c
@@ -104,7 +104,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);