From 02f670545f8fe67c323ac99adb6d07b5a01798ca Mon Sep 17 00:00:00 2001
From: Ricardo Nunez <113212961+ricardonunez-io@users.noreply.github.com>
Date: Fri, 25 Jul 2025 16:17:30 -0700
Subject: [PATCH] [Fix]: Panic on unwrap from client reference

---
 crates/next-api/src/dynamic_imports.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/crates/next-api/src/dynamic_imports.rs b/crates/next-api/src/dynamic_imports.rs
index 14dd4779e46b..865400201e46 100644
--- a/crates/next-api/src/dynamic_imports.rs
+++ b/crates/next-api/src/dynamic_imports.rs
@@ -19,7 +19,7 @@
 //!      to wait until all the dynamic components are being loaded, this ensures hydration mismatch
 //!      won't occur
 
-use anyhow::Result;
+use anyhow::{Result, anyhow};
 use next_core::{
     next_app::ClientReferencesChunks, next_client_reference::EcmascriptClientReferenceModule,
     next_dynamic::NextDynamicEntryModule,
@@ -64,10 +64,13 @@ pub(crate) async fn collect_next_dynamic_chunks(
             // containing the next/dynamic imports
             let availability_info = match chunking_availability {
                 NextDynamicChunkAvailability::ClientReferences(client_reference_chunks) => {
+                    let parent_ref = parent_client_reference
+                        .ok_or_else(|| anyhow!("Parent client reference is None"))?;
+
                     client_reference_chunks
                         .client_component_client_chunks
-                        .get(&parent_client_reference.unwrap())
-                        .unwrap()
+                        .get(&parent_ref)
+                        .ok_or_else(|| anyhow!("No client reference in chunks"))?
                         .1
                 }
                 NextDynamicChunkAvailability::AvailabilityInfo(availability_info) => {