diff --git a/public/kcl-samples/screenshots/car-wheel-assembly.png b/public/kcl-samples/screenshots/car-wheel-assembly.png
index 995ec1479..60ae8b98c 100644
Binary files a/public/kcl-samples/screenshots/car-wheel-assembly.png and b/public/kcl-samples/screenshots/car-wheel-assembly.png differ
diff --git a/rust/kcl-lib/src/execution/mod.rs b/rust/kcl-lib/src/execution/mod.rs
index a356271ed..53c0b8e2a 100644
--- a/rust/kcl-lib/src/execution/mod.rs
+++ b/rust/kcl-lib/src/execution/mod.rs
@@ -722,7 +722,7 @@ impl ExecutorContext {
         exec_state: &mut ExecState,
         preserve_mem: bool,
     ) -> Result<(EnvironmentRef, Option<ModelingSessionData>), KclErrorWithOutputs> {
-        self.prepare_mem(exec_state).await.unwrap();
+        self.prepare_mem(exec_state).await?;
 
         let mut universe = std::collections::HashMap::new();
 
diff --git a/rust/kcl-lib/src/walk/import_graph.rs b/rust/kcl-lib/src/walk/import_graph.rs
index 8a63b6ef8..5dd2bb83a 100644
--- a/rust/kcl-lib/src/walk/import_graph.rs
+++ b/rust/kcl-lib/src/walk/import_graph.rs
@@ -179,13 +179,13 @@ pub(crate) async fn import_universe(
             let Some(module_info) = exec_state.get_module(module_id) else {
                 return Err(KclError::Internal(KclErrorDetails {
                     message: format!("Module {} not found", module_id),
-                    source_ranges: Default::default(),
+                    source_ranges: vec![import_stmt.into()],
                 }));
             };
             let ModuleRepr::Kcl(program, _) = &module_info.repr else {
                 return Err(KclError::Internal(KclErrorDetails {
                     message: format!("Module {} is not a KCL module", module_id),
-                    source_ranges: Default::default(),
+                    source_ranges: vec![import_stmt.into()],
                 }));
             };
             program.clone()