diff --git a/source/blender/blenkernel/intern/attribute_storage.cc b/source/blender/blenkernel/intern/attribute_storage.cc
index ecace71266a..6de9c4af131 100644
--- a/source/blender/blenkernel/intern/attribute_storage.cc
+++ b/source/blender/blenkernel/intern/attribute_storage.cc
@@ -447,6 +447,7 @@ void AttributeStorage::blend_read(BlendDataReader &reader)
   for (const int i : IndexRange(this->dna_attributes_num)) {
     ::Attribute &dna_attr = this->dna_attributes[i];
     BLO_read_string(&reader, &dna_attr.name);
+    BLI_SCOPED_DEFER([&]() { MEM_SAFE_FREE(dna_attr.name); });
 
     const std::optional<AttrDomain> domain = read_attr_domain(dna_attr.domain);
     if (!domain) {
@@ -455,6 +456,7 @@ void AttributeStorage::blend_read(BlendDataReader &reader)
 
     std::optional<Attribute::DataVariant> data = read_attr_data(
         reader, dna_attr.storage_type, dna_attr.data_type, dna_attr);
+    BLI_SCOPED_DEFER([&]() { MEM_SAFE_FREE(dna_attr.data); });
     if (!data) {
       continue;
     }
@@ -468,9 +470,6 @@ void AttributeStorage::blend_read(BlendDataReader &reader)
     if (!this->runtime->attributes.add(std::move(attribute))) {
       CLOG_ERROR(&LOG, "Ignoring attribute with duplicate name: \"%s\"", dna_attr.name);
     }
-
-    MEM_SAFE_FREE(dna_attr.name);
-    MEM_SAFE_FREE(dna_attr.data);
   }
 
   /* These fields are not used at runtime. */
diff --git a/source/blender/blenkernel/intern/geometry_component_edit_data.cc b/source/blender/blenkernel/intern/geometry_component_edit_data.cc
index 831498705f6..38aaba445f3 100644
--- a/source/blender/blenkernel/intern/geometry_component_edit_data.cc
+++ b/source/blender/blenkernel/intern/geometry_component_edit_data.cc
@@ -116,6 +116,9 @@ static void remember_deformed_grease_pencil_if_necessary(const GreasePencil *gre
     if (curves.points_num() != orig_drawing->strokes().points_num()) {
       continue;
     }
+    if (curves.is_empty()) {
+      continue;
+    }
     drawing_hints.positions_data = save_shared_attribute(curves.attributes().lookup("position"));
   }
 }