Merge pull request #9398 from liamwhite/fail

general: improve handling of system startup failure

1 files changed, 3 insertions, 1 deletions

diff --git a/src/core/core.cpp b/src/core/core.cpp
index 94d4e2212..a738f221f 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -389,7 +389,9 @@ struct System::Impl {
         kernel.ShutdownCores();
         cpu_manager.Shutdown();
         debugger.reset();
-        services->KillNVNFlinger();
+        if (services) {
+            services->KillNVNFlinger();
+        }
         kernel.CloseServices();
         services.reset();
         service_manager.reset();