diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 9aa2bdbcdb..10850ad0c7 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2810,7 +2810,7 @@ void Application::cleanupBeforeQuit() {
     DependencyManager::destroy<TabletScriptingInterface>();
     DependencyManager::destroy<ToolbarScriptingInterface>();
     DependencyManager::destroy<OffscreenUi>();
-
+    
     DependencyManager::destroy<OffscreenQmlSurfaceCache>();
 
     _snapshotSoundInjector = nullptr;
diff --git a/libraries/display-plugins/src/display-plugins/AbstractHMDScriptingInterface.cpp b/libraries/display-plugins/src/display-plugins/AbstractHMDScriptingInterface.cpp
index d068bef3b0..4515a28997 100644
--- a/libraries/display-plugins/src/display-plugins/AbstractHMDScriptingInterface.cpp
+++ b/libraries/display-plugins/src/display-plugins/AbstractHMDScriptingInterface.cpp
@@ -47,5 +47,9 @@ void AbstractHMDScriptingInterface::setIPDScale(float IPDScale) {
 }
 
 bool AbstractHMDScriptingInterface::isHMDMode() const {
-    return PluginContainer::getInstance().getActiveDisplayPlugin()->isHmd();
-}
+    auto displayPlugin = PluginContainer::getInstance().getActiveDisplayPlugin();
+    if (displayPlugin) {
+        return displayPlugin->isHmd();
+    }
+    return false;
+}
\ No newline at end of file