diff --git a/source/loader/ze_loader.cpp b/source/loader/ze_loader.cpp index b3ef06ad..d89b5b29 100644 --- a/source/loader/ze_loader.cpp +++ b/source/loader/ze_loader.cpp @@ -682,10 +682,13 @@ namespace loader } } } - loader_driver_ddi::zeDestroyDDiDriverTables(loader::loaderDispatch->pCore); - loader_driver_ddi::zetDestroyDDiDriverTables(loader::loaderDispatch->pTools); - loader_driver_ddi::zesDestroyDDiDriverTables(loader::loaderDispatch->pSysman); - delete loader::loaderDispatch; + if (loader::loaderDispatch) { + loader_driver_ddi::zeDestroyDDiDriverTables(loader::loaderDispatch->pCore); + loader_driver_ddi::zetDestroyDDiDriverTables(loader::loaderDispatch->pTools); + loader_driver_ddi::zesDestroyDDiDriverTables(loader::loaderDispatch->pSysman); + delete loader::loaderDispatch; + loader::loaderDispatch = nullptr; + } }; void context_t::add_loader_version(){