diff --git a/boot/bootutil/src/loader.c b/boot/bootutil/src/loader.c
index 2b0002f..ca78c6e 100644
--- a/boot/bootutil/src/loader.c
+++ b/boot/bootutil/src/loader.c
@@ -745,8 +745,12 @@
     rc = 0;
 
 done:
-    flash_area_close(fap_src);
-    flash_area_close(fap_dst);
+    if (fap_src) {
+        flash_area_close(fap_src);
+    }
+    if (fap_dst) {
+        flash_area_close(fap_dst);
+    }
     return rc;
 }
 
diff --git a/boot/zephyr/flash_map.c b/boot/zephyr/flash_map.c
index 8b78077..e894699 100644
--- a/boot/zephyr/flash_map.c
+++ b/boot/zephyr/flash_map.c
@@ -122,8 +122,13 @@
  */
 void flash_area_close(const struct flash_area *area)
 {
-    struct flash_map_entry *entry = CONTAINER_OF(area, struct flash_map_entry,
-                                                 area);
+    struct flash_map_entry *entry;
+
+    if (!area) {
+        return;
+    }
+
+    entry = CONTAINER_OF(area, struct flash_map_entry, area);
     if (entry->magic != FLASH_MAP_ENTRY_MAGIC) {
         BOOT_LOG_ERR("invalid area %p (id %u)", area, area->fa_id);
         return;