diff --git a/engine/3rdparty_libs/miniaudio/CMakeLists.txt b/engine/3rdparty_libs/miniaudio/CMakeLists.txt
index d531b94e..83f52456 100644
--- a/engine/3rdparty_libs/miniaudio/CMakeLists.txt
+++ b/engine/3rdparty_libs/miniaudio/CMakeLists.txt
@@ -5,4 +5,10 @@ project(miniaudio LANGUAGES CXX)
 set(TargetName miniaudio)
 
 add_library(${TargetName} INTERFACE)
-target_include_directories(${TargetName} INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/)
+
+target_include_directories(${TargetName} INTERFACE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/>  
+    $<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include/3rdPartyLibs/miniaudio>
+)
+
+nau_install(${TargetName} 3rdPartyLibs)
diff --git a/engine/core/modules/platform_app/src/platform/windows/windows_window_manager_impl.cpp b/engine/core/modules/platform_app/src/platform/windows/windows_window_manager_impl.cpp
index b536b4e6..34a3e6c7 100644
--- a/engine/core/modules/platform_app/src/platform/windows/windows_window_manager_impl.cpp
+++ b/engine/core/modules/platform_app/src/platform/windows/windows_window_manager_impl.cpp
@@ -277,9 +277,11 @@ namespace nau
             }
             else
             {
-                auto* const coreGraphics = getServiceProvider().find<ICoreGraphics>();
-                auto task = coreGraphics->closeWindow(hWnd);
-                task.detach();
+                if (auto* const coreGraphics = getServiceProvider().find<ICoreGraphics>())
+                {
+                    auto task = coreGraphics->closeWindow(hWnd);
+                    task.detach();
+                }
                 window.destroyWindow();
             }
         }
@@ -288,9 +290,11 @@ namespace nau
             int width  = LOWORD(lParam);
             int height = HIWORD(lParam);
 
-            auto* const coreGraphics = getServiceProvider().find<ICoreGraphics>();
-            auto task = coreGraphics->requestViewportResize(width, height, hWnd);
-            task.detach();
+            if (auto* const coreGraphics = getServiceProvider().find<ICoreGraphics>())
+            {
+                auto task = coreGraphics->requestViewportResize(width, height, hWnd);
+                task.detach();
+            }
         }
         else if (message == WM_DESTROY)
         {