diff --git a/stand/efi/loader/framebuffer.c b/stand/efi/loader/framebuffer.c
--- a/stand/efi/loader/framebuffer.c
+++ b/stand/efi/loader/framebuffer.c
@@ -569,7 +569,7 @@
 	UINTN nhandles, i, hsize;
 	struct efi_fb efifb;
 	EFI_STATUS status;
-	int rv;
+	int rv = 0;
 
 	gfx_state->tg_fb_type = FB_TEXT;
 
@@ -647,6 +647,9 @@
 		return (1);
 	}
 
+	if (rv != 0)
+		return (rv);
+
 	gfx_state->tg_fb.fb_addr = efifb.fb_addr;
 	gfx_state->tg_fb.fb_size = efifb.fb_size;
 	gfx_state->tg_fb.fb_height = efifb.fb_height;