diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1e87695d8..df03d4460f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -206,6 +206,18 @@ else()
     endif()
 endif()
 
+if(UR_ENABLE_EXCEPTION_SANITIZER)
+    if(APPLE)
+        message(WARNING "Exception sanitizer layer isn't supported on macOS")
+        set(UR_ENABLE_EXCEPTION_SANITIZER OFF)
+    elseif(WIN32)
+        message(WARNING "Exception sanitizer layer isn't supported on Windows")
+        set(UR_ENABLE_EXCEPTION_SANITIZER OFF)
+    else()
+        add_compile_definitions(UR_ENABLE_EXCEPTION_SANITIZER)
+    endif()
+endif()
+
 if(UR_USE_ASAN)
     add_sanitizer_flag(address)
 endif()
diff --git a/source/loader/layers/exception_sanitizer/ur_exceptionddi.cpp b/source/loader/layers/exception_sanitizer/ur_exceptionddi.cpp
index e2d5af9c48..063d2adafd 100644
--- a/source/loader/layers/exception_sanitizer/ur_exceptionddi.cpp
+++ b/source/loader/layers/exception_sanitizer/ur_exceptionddi.cpp
@@ -4898,8 +4898,9 @@ __urdlllocal ur_result_t UR_APICALL urCommandBufferAppendKernelLaunchExp(
         phEvent, ///< [out][optional] return an event object that will be signaled by the
                  ///< completion of this command in the next execution of the
                  ///< command-buffer.
-    ur_exp_command_buffer_command_handle_t
-        *phCommand ///< [out][optional] Handle to this command.
+    ur_exp_command_buffer_command_handle_t *
+        phCommand ///< [out][optional] Handle to this command. Only available if the
+                  ///< command-buffer is updatable.
 ) {
     auto pfnAppendKernelLaunchExp =
         getContext()->urDdiTable.CommandBufferExp.pfnAppendKernelLaunchExp;
diff --git a/source/loader/ur_lib.hpp b/source/loader/ur_lib.hpp
index f3a31b2f67..05bd63117a 100644
--- a/source/loader/ur_lib.hpp
+++ b/source/loader/ur_lib.hpp
@@ -27,7 +27,7 @@
 #include "sanitizer/ur_sanitizer_layer.hpp"
 #endif
 #if UR_ENABLE_EXCEPTION_SANITIZER
-#include "exception-sanitizer/ur_exception_sanitizer_layer.hpp"
+#include "exception_sanitizer/ur_exception_sanitizer_layer.hpp"
 #endif
 
 #include <atomic>
@@ -89,7 +89,7 @@ class __urdlllocal context_t : public AtomicSingleton<context_t> {
 #endif
 #if UR_ENABLE_EXCEPTION_SANITIZER
         {ur_exception_sanitizer_layer::getContext(),
-         ur_exception_sanitizer_layer::forceDelete},
+         ur_exception_sanitizer_layer::context_t::forceDelete},
 #endif
     };