diff --git a/src/blackcore/context/contextsimulatorimpl.cpp b/src/blackcore/context/contextsimulatorimpl.cpp
index 4f4204bef..c304eac6e 100644
--- a/src/blackcore/context/contextsimulatorimpl.cpp
+++ b/src/blackcore/context/contextsimulatorimpl.cpp
@@ -65,7 +65,8 @@ namespace BlackCore
             CContextSimulator::registerHelp();
 
             Q_ASSERT_X(sApp, Q_FUNC_INFO, "Need sApp");
-            m_enableMatchingMessages = CBuildConfig::isLocalDeveloperDebugBuild() ||  sApp->isDeveloperFlagSet();
+            // m_enableMatchingMessages = CBuildConfig::isLocalDeveloperDebugBuild() ||  sApp->isDeveloperFlagSet();
+            m_enableMatchingMessages = true; // there seems to be no big disadavantage in always enabling it
             m_plugins->collectPlugins();
             this->restoreSimulatorPlugins();
 
diff --git a/src/blackgui/components/modelmatcherlogcomponent.cpp b/src/blackgui/components/modelmatcherlogcomponent.cpp
index 7f9db1db5..607ef681a 100644
--- a/src/blackgui/components/modelmatcherlogcomponent.cpp
+++ b/src/blackgui/components/modelmatcherlogcomponent.cpp
@@ -56,8 +56,11 @@ namespace BlackGui
             bool c = sGui->getIContextNetwork()->isReverseLookupMessagesEnabled();
             ui->cb_LogReverseLookup->setChecked(c);
 
-            c = sGui->getIContextSimulator()->isMatchingMessagesEnabled();
-            ui->cb_LogMatchingMessages->setChecked(c);
+            if (sGui)
+            {
+                c = sGui->getIContextSimulator()->isMatchingMessagesEnabled();
+                ui->cb_LogMatchingMessages->setChecked(c);
+            }
         }
 
         bool CModelMatcherLogComponent::hasContexts() const