diff --git a/src/swiftguistandard/swiftguistd.cpp b/src/swiftguistandard/swiftguistd.cpp
index de84215f1..fbb97e621 100644
--- a/src/swiftguistandard/swiftguistd.cpp
+++ b/src/swiftguistandard/swiftguistd.cpp
@@ -62,9 +62,7 @@ using namespace BlackMisc::Audio;
 using namespace BlackMisc::Input;
 using namespace BlackMisc::Simulation;
 
-/*
- * Constructor
- */
+// Constructor
 SwiftGuiStd::SwiftGuiStd(BlackGui::CEnableForFramelessWindow::WindowMode windowMode, QWidget *parent) :
     QMainWindow(parent, CEnableForFramelessWindow::modeToWindowFlags(windowMode)),
     CIdentifiable(this),
diff --git a/src/swiftlauncher/main.cpp b/src/swiftlauncher/main.cpp
index af860110e..1e0f42b16 100644
--- a/src/swiftlauncher/main.cpp
+++ b/src/swiftlauncher/main.cpp
@@ -32,10 +32,14 @@ int main(int argc, char *argv[])
     CGuiApplication::highDpiScreenSupport();
     QApplication qa(argc, argv);
     CGuiApplication a("swift launcher", CApplicationInfo::Laucher, CIcons::swiftLauncher1024());
-    a.useWebDataServices(BlackCore::CWebReaderFlags::AllSwiftDbReaders, CDatabaseReaderConfigList::forLauncher());
     a.addParserOption({{"i", "installer"}, QCoreApplication::translate("main", "Installer setup."), "installer"});
     if (!a.parse()) { return EXIT_FAILURE; }
-    if (!a.start()) { return EXIT_FAILURE; }
+    a.useWebDataServices(BlackCore::CWebReaderFlags::AllSwiftDbReaders, CDatabaseReaderConfigList::forLauncher());
+    if (!a.start())
+    {
+        a.gracefulShutdown();
+        return EXIT_FAILURE;
+    }
     //! [SwiftApplicationDemo]
 
     // Dialog to decide external or internal core