diff --git a/include/etl/memory.h b/include/etl/memory.h
index 8b98f9b0..242472da 100644
--- a/include/etl/memory.h
+++ b/include/etl/memory.h
@@ -1256,6 +1256,7 @@ namespace etl
     //*********************************
     unique_ptr(unique_ptr&& p_) ETL_NOEXCEPT
       : p(p_.release())
+      , deleter(etl::move(p_.deleter))
     {
     }
 #endif
@@ -1281,7 +1282,10 @@ namespace etl
     //*********************************
     ~unique_ptr()
     {
-      deleter(p);
+      if (p != ETL_NULLPTR)
+      {
+        deleter(p);
+      }
     }
 
     //*********************************