From a30077cdd16e1b3404d4f3878d5ff77365d3d278 Mon Sep 17 00:00:00 2001
From: Noah Hilverling <noah.hilverling@icinga.com>
Date: Thu, 12 Nov 2020 12:54:58 +0100
Subject: [PATCH] WIP

---
 lib/remote/jsonrpcconnection.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/remote/jsonrpcconnection.cpp b/lib/remote/jsonrpcconnection.cpp
index 10376c888..2df4c9576 100644
--- a/lib/remote/jsonrpcconnection.cpp
+++ b/lib/remote/jsonrpcconnection.cpp
@@ -258,7 +258,8 @@ void JsonRpcConnection::MessageHandler(const String& jsonString)
 {
 	Dictionary::Ptr message = JsonRpc::DecodeMessage(jsonString);
 
-	Log(LogCritical, "MESSAGE-HANDLER")
+	if (m_Endpoint)
+		Log(LogCritical, "MESSAGE-HANDLER")
 			<< "Got message from endpoint '" << m_Endpoint->GetName() << "': " << jsonString;
 
 	if (m_Endpoint && message->Contains("ts")) {