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
@@ -630,7 +630,7 @@
 			gfx_state->tg_fb_type = FB_UGA;
 			gfx_state->tg_private = uga;
 		} else {
-			return (1);
+			return (efi_status_to_errno(status));
 		}
 	}
 
@@ -644,9 +644,12 @@
 		break;
 
 	default:
-		return (1);
+		return (EINVAL);
 	}
 
+	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;