diff --git a/src/blackgui/copyxswiftbusdialog.cpp b/src/blackgui/copyxswiftbusdialog.cpp
index e5d9e4020..cbea95ecf 100644
--- a/src/blackgui/copyxswiftbusdialog.cpp
+++ b/src/blackgui/copyxswiftbusdialog.cpp
@@ -26,7 +26,7 @@ namespace BlackGui
 {
     int CCopyXSwiftBusDialog::displayDialogAndCopyBuildFiles(const QString &xplaneRootDir, bool checkLatestFile, QWidget *parent)
     {
-        if (sGui && sGui->isShuttingDown()) { return 0; }
+        if (!sGui || sGui->isShuttingDown()) { return 0; }
         if (!CBuildConfig::isLocalDeveloperDebugBuild()) { return -1; }
         if (checkLatestFile && !CXPlaneUtil::hasNewerXSwiftBusBuild(xplaneRootDir)) { return 0; }
         if (!CXPlaneUtil::hasXSwiftBusBuildAndPluginDir(xplaneRootDir)) { return 0; }
diff --git a/src/swiftguistandard/swiftguistdmenus.cpp b/src/swiftguistandard/swiftguistdmenus.cpp
index 906aef61b..e46d31101 100644
--- a/src/swiftguistandard/swiftguistdmenus.cpp
+++ b/src/swiftguistandard/swiftguistdmenus.cpp
@@ -141,7 +141,7 @@ void SwiftGuiStd::initMenus()
     ui->menu_InfoAreas->addActions(ui->comp_MainInfoArea->getInfoAreaSelectActions(true, ui->menu_InfoAreas));
     ui->menu_MovingMap->setIcon(CIcons::swiftMap16());
 
-    if (CBuildConfig::isLocalDeveloperDebugBuild() && ui->menu_File)
+    if (CBuildConfig::isLocalDeveloperDebugBuild() && ui->menu_File && ui->menu_File->actions().size() > 5)
     {
         QAction *a = new QAction(CIcons::swift16(), "Copy XSwiftBus dialog");
         ui->menu_File->insertAction(ui->menu_File->actions().at(5), a);