diff --git a/src/commands/selftestcommand.cpp b/src/commands/selftestcommand.cpp
index 50fc205d7..b92d4a33e 100644
--- a/src/commands/selftestcommand.cpp
+++ b/src/commands/selftestcommand.cpp
@@ -1,286 +1,286 @@
 /* -*- mode: c++; c-basic-offset:4 -*-
     commands/selftestcommand.cpp
 
     This file is part of Kleopatra, the KDE keymanager
     Copyright (c) 2008 Klarälvdalens Datakonsult AB
 
     Kleopatra is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     Kleopatra is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
     the Qt library by Trolltech AS, Norway (or with modified versions
     of Qt that use the same license as Qt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
     Qt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
 */
 
 #include <config-kleopatra.h>
 
 #include "selftestcommand.h"
 
 #include "command_p.h"
 
 #include <dialogs/selftestdialog.h>
 
 #ifdef Q_OS_WIN
 # include <selftest/registrycheck.h>
 #endif
 #include <selftest/enginecheck.h>
 #include <selftest/gpgconfcheck.h>
 #ifdef HAVE_KLEOPATRACLIENT_LIBRARY
 # include <selftest/uiservercheck.h>
 #endif
 #include <selftest/gpgagentcheck.h>
 #include <selftest/libkleopatrarccheck.h>
 
 #include <Libkleo/Stl_Util>
 
 #include <KLocalizedString>
 #include <KConfigGroup>
 #include <KSharedConfig>
 
 #include <boost/shared_ptr.hpp>
 #include <boost/mem_fn.hpp>
 
 #include <vector>
 
 using namespace Kleo;
 using namespace Kleo::Commands;
 using namespace Kleo::Dialogs;
 using namespace boost;
 
 static const char *const components[] = {
     0, // gpgconf
     "gpg",
     "gpg-agent",
     "scdaemon",
     "gpgsm",
     "dirmngr",
 };
 static const unsigned int numComponents = sizeof components / sizeof * components;
 
 class SelfTestCommand::Private : Command::Private
 {
     friend class ::Kleo::Commands::SelfTestCommand;
     SelfTestCommand *q_func() const
     {
         return static_cast<SelfTestCommand *>(q);
     }
 public:
     explicit Private(SelfTestCommand *qq, KeyListController *c);
     ~Private();
 
 private:
     void init();
 
     void ensureDialogCreated()
     {
         if (dialog) {
             return;
         }
         dialog = new SelfTestDialog;
         applyWindowID(dialog);
         dialog->setAttribute(Qt::WA_DeleteOnClose);
 
         connect(dialog, SIGNAL(updateRequested()),
                 q_func(), SLOT(slotUpdateRequested()));
         connect(dialog, SIGNAL(accepted()),
                 q_func(), SLOT(slotDialogAccepted()));
         connect(dialog, SIGNAL(rejected()),
                 q_func(), SLOT(slotDialogRejected()));
 
         dialog->setRunAtStartUp(runAtStartUp());
         dialog->setAutomaticMode(automatic);
     }
 
     void ensureDialogShown()
     {
         ensureDialogCreated();
         if (dialog->isVisible()) {
             dialog->raise();
         } else {
             dialog->show();
         }
     }
 
     bool runAtStartUp() const
     {
         const KConfigGroup config(KSharedConfig::openConfig(), "Self-Test");
         return config.readEntry("run-at-startup", true);
     }
 
     void setRunAtStartUp(bool on)
     {
         KConfigGroup config(KSharedConfig::openConfig(), "Self-Test");
         config.writeEntry("run-at-startup", on);
     }
 
     void runTests()
     {
         std::vector< shared_ptr<Kleo::SelfTest> > tests;
 
 #if defined(Q_OS_WIN)
         //Q_EMIT q->info( i18n("Checking Windows Registry...") );
         tests.push_back(makeGpgProgramRegistryCheckSelfTest());
+#if defined(HAVE_KLEOPATRACLIENT_LIBRARY)
+        //Q_EMIT q->info( i18n("Checking Ui Server connectivity...") );
+        tests.push_back(makeUiServerConnectivitySelfTest());
+#endif
 #endif
         //Q_EMIT q->info( i18n("Checking gpg installation...") );
         tests.push_back(makeGpgEngineCheckSelfTest());
         //Q_EMIT q->info( i18n("Checking gpgsm installation...") );
         tests.push_back(makeGpgSmEngineCheckSelfTest());
         //Q_EMIT q->info( i18n("Checking gpgconf installation...") );
         tests.push_back(makeGpgConfEngineCheckSelfTest());
         for (unsigned int i = 0; i < numComponents; ++i) {
             //Q_EMIT q->info( i18n("Checking %1 configuration...", components[i]) );
             tests.push_back(makeGpgConfCheckConfigurationSelfTest(components[i]));
         }
-#if defined( HAVE_KLEOPATRACLIENT_LIBRARY )
-        //Q_EMIT q->info( i18n("Checking Ui Server connectivity...") );
-        tests.push_back(makeUiServerConnectivitySelfTest());
-#endif
 #ifndef Q_OS_WIN
         tests.push_back(makeGpgAgentConnectivitySelfTest());
 #endif
         tests.push_back(makeLibKleopatraRcSelfTest());
 
         if (!dialog && kdtools::none_of(tests, mem_fn(&Kleo::SelfTest::failed))) {
             finished();
             return;
         }
 
         ensureDialogCreated();
 
         dialog->clear();
         dialog->addSelfTests(tests);
 
         ensureDialogShown();
     }
 
 private:
     void slotDialogAccepted()
     {
         setRunAtStartUp(dialog->runAtStartUp());
         finished();
     }
     void slotDialogRejected()
     {
         if (automatic) {
             canceled = true;
             Command::Private::canceled();
         } else {
             slotDialogAccepted();
         }
     }
     void slotUpdateRequested()
     {
         runTests();
     }
 
 private:
     QPointer<SelfTestDialog> dialog;
     bool canceled;
     bool automatic;
 };
 
 SelfTestCommand::Private *SelfTestCommand::d_func()
 {
     return static_cast<Private *>(d.get());
 }
 const SelfTestCommand::Private *SelfTestCommand::d_func() const
 {
     return static_cast<const Private *>(d.get());
 }
 
 #define d d_func()
 #define q q_func()
 
 SelfTestCommand::Private::Private(SelfTestCommand *qq, KeyListController *c)
     : Command::Private(qq, c),
       dialog(),
       canceled(false),
       automatic(false)
 {
 
 }
 
 SelfTestCommand::Private::~Private()
 {
 
 }
 
 SelfTestCommand::SelfTestCommand(KeyListController *c)
     : Command(new Private(this, c))
 {
     d->init();
 }
 
 SelfTestCommand::SelfTestCommand(QAbstractItemView *v, KeyListController *c)
     : Command(v, new Private(this, c))
 {
     d->init();
 }
 
 void SelfTestCommand::Private::init()
 {
 
 }
 
 SelfTestCommand::~SelfTestCommand() {}
 
 void SelfTestCommand::setAutomaticMode(bool on)
 {
     d->automatic = on;
     if (d->dialog) {
         d->dialog->setAutomaticMode(on);
     }
 }
 
 bool SelfTestCommand::isCanceled() const
 {
     return d->canceled;
 }
 
 void SelfTestCommand::doStart()
 {
 
     if (d->automatic) {
         if (!d->runAtStartUp()) {
             d->finished();
             return;
         }
     } else {
         d->ensureDialogCreated();
     }
 
     d->runTests();
 
 }
 
 void SelfTestCommand::doCancel()
 {
     d->canceled = true;
     if (d->dialog) {
         d->dialog->close();
     }
     d->dialog = 0;
 }
 
 #undef d
 #undef q
 
 #include "moc_selftestcommand.cpp"
diff --git a/src/main.cpp b/src/main.cpp
index 24f3a85b6..9d83e8983 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,263 +1,263 @@
 /*
     main.cpp
 
     This file is part of Kleopatra, the KDE keymanager
     Copyright (c) 2001,2002,2004,2008 Klar�vdalens Datakonsult AB
 
     Kleopatra is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     Kleopatra is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
     the Qt library by Trolltech AS, Norway (or with modified versions
     of Qt that use the same license as Qt), and distribute linked
     combinations including the two.  You must obey the GNU General
     Public License in all respects for all of the code used other than
     Qt.  If you modify this file, you may extend this exception to
     your version of the file, but you are not obligated to do so.  If
     you do not wish to do so, delete this exception statement from
     your version.
 */
 
 #include <config-kleopatra.h>
 
 #include "aboutdata.h"
 #include "kleopatraapplication.h"
 #include "mainwindow.h"
 
 #include <kdelibs4configmigrator.h>
 
 #include <commands/reloadkeyscommand.h>
 #include <commands/selftestcommand.h>
 
 #include <utils/gnupg-helper.h>
 #include <utils/archivedefinition.h>
 #include "utils/kuniqueservice.h"
 
 #include <uiserver/uiserver.h>
 #include <uiserver/assuancommand.h>
 #include <uiserver/echocommand.h>
 #include <uiserver/decryptcommand.h>
 #include <uiserver/verifycommand.h>
 #include <uiserver/decryptverifyfilescommand.h>
 #include <uiserver/decryptfilescommand.h>
 #include <uiserver/verifyfilescommand.h>
 #include <uiserver/prepencryptcommand.h>
 #include <uiserver/prepsigncommand.h>
 #include <uiserver/encryptcommand.h>
 #include <uiserver/signcommand.h>
 #include <uiserver/signencryptfilescommand.h>
 #include <uiserver/selectcertificatecommand.h>
 #include <uiserver/importfilescommand.h>
 #include <uiserver/createchecksumscommand.h>
 #include <uiserver/verifychecksumscommand.h>
 
 #include <Libkleo/ChecksumDefinition>
 
 #include "kleopatra_debug.h"
 #include "kleopatra_options.h"
 
 #include <KLocalizedString>
 #include <kiconloader.h>
 #include <kmessagebox.h>
 
 #include <QTextDocument> // for Qt::escape
 #include <QMessageBox>
 #include <QTimer>
 #include <QTime>
 #include <QEventLoop>
 #include <QThreadPool>
 
 #include <gpgme++/global.h>
 #include <gpgme++/error.h>
 
 #include <boost/shared_ptr.hpp>
 
 #include <cassert>
 #include <iostream>
 #include <QCommandLineParser>
 
 using namespace boost;
 
 namespace
 {
 template <typename T>
 boost::shared_ptr<T> make_shared_ptr(T *t)
 {
     return t ? boost::shared_ptr<T>(t) : boost::shared_ptr<T>();
 }
 }
 
 static bool selfCheck()
 {
     Kleo::Commands::SelfTestCommand cmd(0);
     cmd.setAutoDelete(false);
     cmd.setAutomaticMode(true);
     QEventLoop loop;
     QObject::connect(&cmd, &Kleo::Commands::SelfTestCommand::finished, &loop, &QEventLoop::quit);
     QTimer::singleShot(0, &cmd, &Kleo::Command::start);   // start() may Q_EMIT finished()...
     loop.exec();
     if (cmd.isCanceled()) {
         return false;
     } else {
         return true;
     }
 }
 
 static void fillKeyCache(Kleo::UiServer *server)
 {
     Kleo::ReloadKeysCommand *cmd = new Kleo::ReloadKeysCommand(0);
     QObject::connect(cmd, SIGNAL(finished()), server, SLOT(enableCryptoCommands()));
     cmd->start();
 }
 
 int main(int argc, char **argv)
 {
     KleopatraApplication app(argc, argv);
     app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
 
     QTime timer;
     timer.start();
 
     KLocalizedString::setApplicationDomain("kleopatra");
 
     KUniqueService service;
     QObject::connect(&service, &KUniqueService::activateRequested,
                      &app, &KleopatraApplication::slotActivateRequested);
     QObject::connect(&app, &KleopatraApplication::setExitValue,
     &service, [&service](int i) {
         service.setExitValue(i);
     });
 
     AboutData aboutData;
 
     KAboutData::setApplicationData(aboutData);
 
     QCommandLineParser parser;
     aboutData.setupCommandLine(&parser);
     kleopatra_options(&parser);
 
     parser.process(QApplication::arguments());
     aboutData.processCommandLine(&parser);
 
     Kdelibs4ConfigMigrator migrate(QStringLiteral("kleopatra"));
     migrate.setConfigFiles(QStringList() << QStringLiteral("kleopatrarc")
                                          << QStringLiteral("libkleopatrarc"));
     migrate.setUiFiles(QStringList() << QStringLiteral("kleopatra.rc"));
     migrate.migrate();
 
     qCDebug(KLEOPATRA_LOG) << "Startup timing:" << timer.elapsed() << "ms elapsed: Application created";
 
     // Initialize GpgME
     const GpgME::Error gpgmeInitError = GpgME::initializeLibrary(0);
 
     {
         const unsigned int threads = QThreadPool::globalInstance()->maxThreadCount();
         QThreadPool::globalInstance()->setMaxThreadCount(qMax(2U, threads));
     }
     if (gpgmeInitError) {
         KMessageBox::sorry(0, xi18nc("@info",
                                      "<para>The version of the <application>GpgME</application> library you are running against "
                                      "is older than the one that the <application>GpgME++</application> library was built against.</para>"
                                      "<para><application>Kleopatra</application> will not function in this setting.</para>"
                                      "<para>Please ask your administrator for help in resolving this issue.</para>"),
                            i18nc("@title", "GpgME Too Old"));
         return EXIT_FAILURE;
     }
 
     Kleo::ChecksumDefinition::setInstallPath(Kleo::gpg4winInstallPath());
     Kleo::ArchiveDefinition::setInstallPath(Kleo::gnupgInstallPath());
 
     int rc;
+    Kleo::UiServer server(parser.value(QStringLiteral("uiserver-socket")));
     try {
-        Kleo::UiServer server(parser.value(QStringLiteral("uiserver-socket")));
-
         qCDebug(KLEOPATRA_LOG) << "Startup timing:" << timer.elapsed() << "ms elapsed: UiServer created";
 
         QObject::connect(&server, &Kleo::UiServer::startKeyManagerRequested, &app, &KleopatraApplication::openOrRaiseMainWindow);
 
         QObject::connect(&server, &Kleo::UiServer::startConfigDialogRequested, &app, &KleopatraApplication::openOrRaiseConfigDialog);
 
 #define REGISTER( Command ) server.registerCommandFactory( boost::shared_ptr<Kleo::AssuanCommandFactory>( new Kleo::GenericAssuanCommandFactory<Kleo::Command> ) )
         REGISTER(CreateChecksumsCommand);
         REGISTER(DecryptCommand);
         REGISTER(DecryptFilesCommand);
         REGISTER(DecryptVerifyFilesCommand);
         REGISTER(EchoCommand);
         REGISTER(EncryptCommand);
         REGISTER(EncryptFilesCommand);
         REGISTER(EncryptSignFilesCommand);
         REGISTER(ImportFilesCommand);
         REGISTER(PrepEncryptCommand);
         REGISTER(PrepSignCommand);
         REGISTER(SelectCertificateCommand);
         REGISTER(SignCommand);
         REGISTER(SignEncryptFilesCommand);
         REGISTER(SignFilesCommand);
         REGISTER(VerifyChecksumsCommand);
         REGISTER(VerifyCommand);
         REGISTER(VerifyFilesCommand);
 #undef REGISTER
 
         server.start();
         qCDebug(KLEOPATRA_LOG) << "Startup timing:" << timer.elapsed() << "ms elapsed: UiServer started";
-
-        const bool daemon = parser.isSet(QStringLiteral("daemon"));
-        if (!daemon && app.isSessionRestored()) {
-            app.restoreMainWindow();
-        }
-
-        if (!selfCheck()) {
-            return EXIT_FAILURE;
-        }
-        qCDebug(KLEOPATRA_LOG) << "Startup timing:" << timer.elapsed() << "ms elapsed: SelfCheck completed";
-
-        fillKeyCache(&server);
-#ifndef QT_NO_SYSTEMTRAYICON
-        app.startMonitoringSmartCard();
-#endif
-        app.setIgnoreNewInstance(false);
-
-        if (!daemon) {
-            const QString err = app.newInstance(parser);
-            if (!err.isEmpty()) {
-                std::cerr << i18n("Invalid arguments: %1", err).toLocal8Bit().constData() << "\n";
-                return EXIT_FAILURE;
-            }
-            qCDebug(KLEOPATRA_LOG) << "Startup timing:" << timer.elapsed() << "ms elapsed: new instance created";
-        }
-
-        rc = app.exec();
-
-        app.setIgnoreNewInstance(true);
-        QObject::disconnect(&server, &Kleo::UiServer::startKeyManagerRequested, &app, &KleopatraApplication::openOrRaiseMainWindow);
-        QObject::disconnect(&server, &Kleo::UiServer::startConfigDialogRequested, &app, &KleopatraApplication::openOrRaiseConfigDialog);
-
-        server.stop();
-        server.waitForStopped();
     } catch (const std::exception &e) {
+        qCDebug(KLEOPATRA_LOG) << "Failed to start UI Server: " << e.what();
+#ifdef Q_OS_WIN
+        // Once there actually is a plugin for other systems then Windows this
+        // error should probably be shown, too. But currently only Windows users need
+        // to care.
         QMessageBox::information(0, i18n("GPG UI Server Error"),
                                  i18n("<qt>The Kleopatra GPG UI Server Module could not be initialized.<br/>"
                                       "The error given was: <b>%1</b><br/>"
                                       "You can use Kleopatra as a certificate manager, but cryptographic plugins that "
                                       "rely on a GPG UI Server being present might not work correctly, or at all.</qt>",
                                       QString::fromUtf8(e.what()).toHtmlEscaped()));
-        app.startMonitoringSmartCard();
-        app.setIgnoreNewInstance(false);
-        rc = app.exec();
-        app.setIgnoreNewInstance(true);
+#endif
     }
+    const bool daemon = parser.isSet(QStringLiteral("daemon"));
+    if (!daemon && app.isSessionRestored()) {
+        app.restoreMainWindow();
+    }
+
+    if (!selfCheck()) {
+        return EXIT_FAILURE;
+    }
+    qCDebug(KLEOPATRA_LOG) << "Startup timing:" << timer.elapsed() << "ms elapsed: SelfCheck completed";
+
+    fillKeyCache(&server);
+#ifndef QT_NO_SYSTEMTRAYICON
+    app.startMonitoringSmartCard();
+#endif
+    app.setIgnoreNewInstance(false);
+
+    if (!daemon) {
+        const QString err = app.newInstance(parser);
+        if (!err.isEmpty()) {
+            std::cerr << i18n("Invalid arguments: %1", err).toLocal8Bit().constData() << "\n";
+            return EXIT_FAILURE;
+        }
+        qCDebug(KLEOPATRA_LOG) << "Startup timing:" << timer.elapsed() << "ms elapsed: new instance created";
+    }
+
+    rc = app.exec();
+
+    app.setIgnoreNewInstance(true);
+    QObject::disconnect(&server, &Kleo::UiServer::startKeyManagerRequested, &app, &KleopatraApplication::openOrRaiseMainWindow);
+    QObject::disconnect(&server, &Kleo::UiServer::startConfigDialogRequested, &app, &KleopatraApplication::openOrRaiseConfigDialog);
+
+    server.stop();
+    server.waitForStopped();
 
     return rc;
 }