diff --git a/include/etl/optional.h b/include/etl/optional.h
index 371c9f2a..eeb4b5c7 100644
--- a/include/etl/optional.h
+++ b/include/etl/optional.h
@@ -59,7 +59,7 @@ namespace etl
 
     // Convertible to any type of null non-member pointer.
     template <class T>
-    operator T*() const
+    ETL_CONSTEXPR operator T*() const ETL_NOEXCEPT
     {
       return 0;
     }
@@ -74,7 +74,7 @@ namespace etl
   /// A null option.
   ///\ingroup utilities
   //*****************************************************************************
-  const nullopt_t nullopt = {};
+  ETL_INLINE_VAR ETL_CONSTANT nullopt_t nullopt = {};
 
   //***************************************************************************
   /// Exception for optional.