diff --git a/lib/icinga/checkable-check.cpp b/lib/icinga/checkable-check.cpp
index 6a3cd178b..1d5153d57 100644
--- a/lib/icinga/checkable-check.cpp
+++ b/lib/icinga/checkable-check.cpp
@@ -476,8 +476,16 @@ void Checkable::ExecuteCheck(void)
 			/* fail to perform check on unconnected endpoint */
 			cr->SetState(ServiceUnknown);
 
-			cr->SetOutput("Remote Icinga instance '" + endpoint->GetName() +
-			    "' " + "is not connected to '" + Endpoint::GetLocalEndpoint()->GetName() + "'");
+			String output = "Remote Icinga instance '" + endpoint->GetName() + "' is not connected to ";
+
+			Endpoint::Ptr localEndpoint = Endpoint::GetLocalEndpoint();
+
+			if (localEndpoint)
+				output += "'" + localEndpoint->GetName() + "'";
+			else
+				output += "this instance";
+
+			cr->SetOutput(output);
 
 			ProcessCheckResult(cr);
 		}