diff --git a/apps/bltgrid.c b/apps/bltgrid.c
index 2adde6a..4500fbb 100644
--- a/apps/bltgrid.c
+++ b/apps/bltgrid.c
@@ -46,7 +46,7 @@ draw_boxes(EFI_GRAPHICS_OUTPUT_PROTOCOL *gop)
 		UINTN SizeOfInfo;
 		rc = uefi_call_wrapper(gop->QueryMode, 4, gop, i, &SizeOfInfo,
 					&info);
-		if (EFI_ERROR(rc) && rc == EFI_NOT_STARTED) {
+		if (rc == EFI_NOT_STARTED) {
 			Print(L"gop->QueryMode() returned %r\n", rc);
 			Print(L"Trying to start GOP with SetMode().\n");
 			rc = uefi_call_wrapper(gop->SetMode, 2, gop,
@@ -84,6 +84,7 @@ draw_boxes(EFI_GRAPHICS_OUTPUT_PROTOCOL *gop)
 				  info->HorizontalResolution,
 				  info->VerticalResolution,
 				  0);
+		FreePool(PixelBuffer);
 		return;
 	}
 	Print(L"Never found the active video mode?\n");
diff --git a/apps/lfbgrid.c b/apps/lfbgrid.c
index c4a688c..05977d2 100644
--- a/apps/lfbgrid.c
+++ b/apps/lfbgrid.c
@@ -71,7 +71,7 @@ draw_boxes(EFI_GRAPHICS_OUTPUT_PROTOCOL *gop)
 		UINTN SizeOfInfo;
 		rc = uefi_call_wrapper(gop->QueryMode, 4, gop, i, &SizeOfInfo,
 					&info);
-		if (EFI_ERROR(rc) && rc == EFI_NOT_STARTED) {
+		if (rc == EFI_NOT_STARTED) {
 			Print(L"gop->QueryMode() returned %r\n", rc);
 			Print(L"Trying to start GOP with SetMode().\n");
 			rc = uefi_call_wrapper(gop->SetMode, 2, gop,
diff --git a/apps/modelist.c b/apps/modelist.c
index 26892e1..13219b7 100644
--- a/apps/modelist.c
+++ b/apps/modelist.c
@@ -22,7 +22,7 @@ print_modes(EFI_GRAPHICS_OUTPUT_PROTOCOL *gop)
 		UINTN SizeOfInfo;
 		rc = uefi_call_wrapper(gop->QueryMode, 4, gop, i, &SizeOfInfo,
 					&info);
-		if (EFI_ERROR(rc) && rc == EFI_NOT_STARTED) {
+		if (rc == EFI_NOT_STARTED) {
 			Print(L"gop->QueryMode() returned %r\n", rc);
 			Print(L"Trying to start GOP with SetMode().\n");
 			rc = uefi_call_wrapper(gop->SetMode, 2, gop,