From d0d64a98cf1086adf8354798eaca4e53f2dcacd6 Mon Sep 17 00:00:00 2001
From: KrasnoshchokBohdan <krasnoshchok.bohdan@gmail.com>
Date: Sat, 3 May 2025 13:26:14 +0300
Subject: [PATCH] magento/magento2#39729: Cannot return null for non-nullable
 field "SelectedCustomizableOption.label"

---
 .../QuoteGraphQl/Model/Resolver/CustomizableOptions.php  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CustomizableOptions.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CustomizableOptions.php
index 87ed4ba7ef5d6..c0ef249237fa1 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/CustomizableOptions.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/CustomizableOptions.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -59,7 +59,10 @@ public function resolve(Field $field, $context, ResolveInfo $info, ?array $value
                 $cartItem,
                 (int)$customizableOptionId
             );
-            $customizableOptionsData[] = $customizableOption;
+
+            if (!empty($customizableOption)) {
+                $customizableOptionsData[] = $customizableOption;
+            }
         }
         return $customizableOptionsData;
     }