diff --git a/src/plugins/simulator/xplane/simulator_xplane.cpp b/src/plugins/simulator/xplane/simulator_xplane.cpp
index 69b030fbd..c25b16d3b 100644
--- a/src/plugins/simulator/xplane/simulator_xplane.cpp
+++ b/src/plugins/simulator/xplane/simulator_xplane.cpp
@@ -24,14 +24,16 @@ using namespace BlackMisc::Simulation;
 using namespace BlackMisc::Geo;
 using namespace BlackSim;
 
+namespace {
+    inline QString xbusServiceName() {
+        return QStringLiteral("org.swift.xbus");
+    }
+}
+
 namespace BlackSimPlugin
 {
     namespace XPlane
     {
-        
-        static inline QString xbusServiceName() {
-          return QStringLiteral("org.swift.xbus");
-        }
 
         CSimulatorXPlane::CSimulatorXPlane(IOwnAircraftProvider *ownAircraftProvider, IRemoteAircraftProvider *remoteAircraftProvider, QObject *parent) :
             CSimulatorCommon(CSimulatorInfo::XP(), ownAircraftProvider, remoteAircraftProvider, parent)
@@ -232,7 +234,10 @@ namespace BlackSimPlugin
 
         void CSimulatorXPlane::displayStatusMessage(const BlackMisc::CStatusMessage &message) const
         {
-            Q_ASSERT(isConnected());
+            /* We do not assert here as status message may come because of network problems */
+            if (!isConnected())
+                return;
+            
             // TODO XPLMSpeakString()? 
             // http://www.xsquawkbox.net/xpsdk/mediawiki/XPLMSpeakString
             Q_UNUSED(message);
@@ -240,7 +245,9 @@ namespace BlackSimPlugin
 
         void CSimulatorXPlane::displayTextMessage(const BlackMisc::Network::CTextMessage &message) const
         {
-            Q_ASSERT(isConnected());
+            if (!isConnected())
+                return;
+            
             // TODO XPLMSpeakString()? 
             // http://www.xsquawkbox.net/xpsdk/mediawiki/XPLMSpeakString
             Q_UNUSED(message);
diff --git a/src/xbus/plugin.cpp b/src/xbus/plugin.cpp
index 14629ecd9..bc9710c7a 100644
--- a/src/xbus/plugin.cpp
+++ b/src/xbus/plugin.cpp
@@ -7,7 +7,11 @@
 #include "service.h"
 #include "traffic.h"
 
-#define XBUS_SERVICE_SERVICENAME "org.swift.xbus"
+namespace {
+    inline QString xbusServiceName() {
+        return QStringLiteral("org.swift.xbus");
+    }
+}
 
 namespace XBus
 {
@@ -25,7 +29,7 @@ namespace XBus
         Q_ASSERT(! m_server);
         for (auto &item : m_startServerMenuItems) { item.setEnabled(false); }
 
-        m_server = new BlackCore::CDBusServer(XBUS_SERVICE_SERVICENAME, address, this);
+        m_server = new BlackCore::CDBusServer(xbusServiceName(), address, this);
         m_service = new CService(this);
         m_traffic = new CTraffic(this);
         m_server->addObject(CService::ObjectPath(), m_service);