diff --git a/arch/arm/src/armv7-a/arm_addrenv.c b/arch/arm/src/armv7-a/arm_addrenv.c
index a44c2c1de9..7b21274ca2 100644
--- a/arch/arm/src/armv7-a/arm_addrenv.c
+++ b/arch/arm/src/armv7-a/arm_addrenv.c
@@ -556,7 +556,7 @@ int up_addrenv_select(const arch_addrenv_t *addrenv)
         }
       else
         {
-          binfo("data: clear l1 (vaddr=%x)\n", vaddr);
+          binfo("heap: clear l1 (vaddr=%x)\n", vaddr);
           mmu_l1_clrentry(vaddr);
         }
     }
diff --git a/arch/arm/src/armv7-a/arm_addrenv_utils.c b/arch/arm/src/armv7-a/arm_addrenv_utils.c
index 2433ab5f89..0b1b62d8bd 100644
--- a/arch/arm/src/armv7-a/arm_addrenv_utils.c
+++ b/arch/arm/src/armv7-a/arm_addrenv_utils.c
@@ -209,6 +209,7 @@ void arm_addrenv_destroy_region(uintptr_t **list, unsigned int listlen,
           /* And free the L2 page table itself */
 
           mm_pgfree((uintptr_t)list[i], 1);
+          list[i] = NULL;
         }
     }
 }