diff --git a/+siibra/+internal/API.m b/+siibra/+internal/API.m
index f54644a..a99f89c 100644
--- a/+siibra/+internal/API.m
+++ b/+siibra/+internal/API.m
@@ -34,6 +34,7 @@
                     options);
             catch Exception
                 delete(path)
+                throw(Exception) 
             end
         end
 
diff --git a/+siibra/+items/Space.m b/+siibra/+items/Space.m
index 90b4f33..55117da 100644
--- a/+siibra/+items/Space.m
+++ b/+siibra/+items/Space.m
@@ -20,10 +20,14 @@
         function niftiImage = loadTemplateResampledForParcellation(obj, parcellation)
             cachedPath = siibra.internal.cache(obj.Name + ".nii.gz", "template_cache");
             if ~isfile(cachedPath)
-                siibra.internal.API.doWebsaveWithLongTimeout( ...
-                    cachedPath, ...
-                    siibra.internal.API.templateForParcellationMap(parcellation.Id, obj.Id) ...
-                );
+                try
+                    siibra.internal.API.doWebsaveWithLongTimeout( ...
+                        cachedPath, ...
+                        siibra.internal.API.templateForParcellationMap(parcellation.Id, obj.Id) ...
+                    );
+                catch Exception
+                    error("Space has no template for given parcellation!")
+                end
             end
             niftiImage = siibra.items.NiftiImage(cachedPath);
         end
diff --git a/step-by-step/01_atlases_and_brain_parcellations/01_selecting_a_predefined_atlas.mlx b/step-by-step/01_atlases_and_brain_parcellations/01_selecting_a_predefined_atlas.mlx
index 0bee2d0..fc69d10 100644
Binary files a/step-by-step/01_atlases_and_brain_parcellations/01_selecting_a_predefined_atlas.mlx and b/step-by-step/01_atlases_and_brain_parcellations/01_selecting_a_predefined_atlas.mlx differ
diff --git a/step-by-step/01_atlases_and_brain_parcellations/02_find_predefined_parcellations.mlx b/step-by-step/01_atlases_and_brain_parcellations/02_find_predefined_parcellations.mlx
index 4525abf..2f85f8e 100644
Binary files a/step-by-step/01_atlases_and_brain_parcellations/02_find_predefined_parcellations.mlx and b/step-by-step/01_atlases_and_brain_parcellations/02_find_predefined_parcellations.mlx differ
diff --git a/step-by-step/01_atlases_and_brain_parcellations/03_explore_brain_region_hierarchies.mlx b/step-by-step/01_atlases_and_brain_parcellations/03_explore_brain_region_hierarchies.mlx
index 0200a92..c294e77 100644
Binary files a/step-by-step/01_atlases_and_brain_parcellations/03_explore_brain_region_hierarchies.mlx and b/step-by-step/01_atlases_and_brain_parcellations/03_explore_brain_region_hierarchies.mlx differ
diff --git a/step-by-step/01_atlases_and_brain_parcellations/04_find_brain_regions_in_a_parcellation.mlx b/step-by-step/01_atlases_and_brain_parcellations/04_find_brain_regions_in_a_parcellation.mlx
index 25ca549..7a49249 100644
Binary files a/step-by-step/01_atlases_and_brain_parcellations/04_find_brain_regions_in_a_parcellation.mlx and b/step-by-step/01_atlases_and_brain_parcellations/04_find_brain_regions_in_a_parcellation.mlx differ
diff --git a/step-by-step/01_atlases_and_brain_parcellations/05_basic_brain_region_properties.mlx b/step-by-step/01_atlases_and_brain_parcellations/05_basic_brain_region_properties.mlx
index 47a39a0..2d6f21d 100644
Binary files a/step-by-step/01_atlases_and_brain_parcellations/05_basic_brain_region_properties.mlx and b/step-by-step/01_atlases_and_brain_parcellations/05_basic_brain_region_properties.mlx differ
diff --git a/step-by-step/01_atlases_and_brain_parcellations/06_spatial_properties_of_brain_regions.mlx b/step-by-step/01_atlases_and_brain_parcellations/06_spatial_properties_of_brain_regions.mlx
index 86a3383..0fed939 100644
Binary files a/step-by-step/01_atlases_and_brain_parcellations/06_spatial_properties_of_brain_regions.mlx and b/step-by-step/01_atlases_and_brain_parcellations/06_spatial_properties_of_brain_regions.mlx differ
diff --git a/step-by-step/02_maps_and_templates/01_find_predefined_reference_spaces.mlx b/step-by-step/02_maps_and_templates/01_find_predefined_reference_spaces.mlx
index 0920cab..3917262 100644
Binary files a/step-by-step/02_maps_and_templates/01_find_predefined_reference_spaces.mlx and b/step-by-step/02_maps_and_templates/01_find_predefined_reference_spaces.mlx differ
diff --git a/step-by-step/02_maps_and_templates/02_access_brain_reference_templates.mlx b/step-by-step/02_maps_and_templates/02_access_brain_reference_templates.mlx
index 35bde0c..0a804d5 100644
Binary files a/step-by-step/02_maps_and_templates/02_access_brain_reference_templates.mlx and b/step-by-step/02_maps_and_templates/02_access_brain_reference_templates.mlx differ
diff --git a/step-by-step/02_maps_and_templates/04_access_big_brain.mlx b/step-by-step/02_maps_and_templates/04_access_big_brain.mlx
index 411aa2b..94eccf3 100644
Binary files a/step-by-step/02_maps_and_templates/04_access_big_brain.mlx and b/step-by-step/02_maps_and_templates/04_access_big_brain.mlx differ
diff --git a/walkthrough.mlx b/walkthrough.mlx
index ac83e1d..db4ca45 100644
Binary files a/walkthrough.mlx and b/walkthrough.mlx differ